Merge lp://staging/~laurynas-biveinis/percona-pam-for-mysql/autoreconf into lp://staging/percona-pam-for-mysql

Proposed by Laurynas Biveinis
Status: Merged
Approved by: Laurynas Biveinis
Approved revision: 12
Merge reported by: Laurynas Biveinis
Merged at revision: not available
Proposed branch: lp://staging/~laurynas-biveinis/percona-pam-for-mysql/autoreconf
Merge into: lp://staging/percona-pam-for-mysql
Diff against target: 74 lines (+13/-10)
4 files modified
.bzrignore (+1/-0)
Makefile.am (+2/-0)
bootstrap (+1/-5)
configure.ac (+9/-5)
To merge this branch: bzr merge lp://staging/~laurynas-biveinis/percona-pam-for-mysql/autoreconf
Reviewer Review Type Date Requested Status
Valentine Gostev (community) Approve
Laurynas Biveinis (community) Needs Resubmitting
Review via email: mp+81521@code.staging.launchpad.net

Commit message

Fix bug 885305, bug 885311 (various bootstrap script bugs) by
rewriting that script in the proper way, which is using autoreconf.
To use it better, also do some changes to the build system itself:
- New directory m4 for m4 macros, specify it in configure.ac,
  Makefile.am and bootstrap.
- Set "foreign" project option for Automake.
- Use AS_HELP_STRING instead of obsolete AC_HELP_STRING.
- Remove AC_PROG_SED as it is not present on some pre-historic
  autoconfes.

Description of the change

Fix bug 885305, bug 885311 (various bootstrap script bugs) by
rewriting that script in the proper way, which is using autoreconf.
To use it better, also do some changes to the build system itself:
- New directory m4 for m4 macros, specify it in configure.ac and
Makefile.am.
- Set "foreign" project option for Automake.

To post a comment you must log in.
Revision history for this message
Valentine Gostev (longbow) wrote :
Download full text (3.6 KiB)

bootstrap now works from the first time, but build fails on centos5-64 with such output:

[root@test-cent5-64-t506 autoreconf]# bzr log | head
------------------------------------------------------------
revno: 12
fixes bug(s): https://launchpad.net/bugs/885305 https://launchpad.net/bugs/885311
committer: Laurynas Biveinis <email address hidden>
branch nick: autoreconf
timestamp: Tue 2011-11-08 06:17:33 +0200
message:
  Fix bug 885305, bug 885311 (various bootstrap script bugs) by
  rewriting that script in the proper way, which is using autoreconf.
  To use it better, also do some changes to the build system itself:
[root@test-cent5-64-t506 autoreconf]# bzr revision-info
12 <email address hidden>
[root@test-cent5-64-t506 autoreconf]# ./bootstrap
You should update your `aclocal.m4' by running aclocal.
libtoolize: `config.guess' exists: use `--force' to overwrite
libtoolize: `config.sub' exists: use `--force' to overwrite
libtoolize: `ltmain.sh' exists: use `--force' to overwrite
src/Makefile.am: installing `./compile'
[root@test-cent5-64-t506 autoreconf]# ./configure > /dev/null
[root@test-cent5-64-t506 autoreconf]# make
make all-recursive
make[1]: Entering directory `/root/pam/source/autoreconf'
Making all in src
make[2]: Entering directory `/root/pam/source/autoreconf/src'
if /bin/sh ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -DMYSQL_DYNAMIC_PLUGIN -isystem /usr/include/mysql -Wall -Wextra -g -O2 -MT auth_pam_la-auth_pam.lo -MD -MP -MF ".deps/auth_pam_la-auth_pam.Tpo" -c -o auth_pam_la-auth_pam.lo `test -f 'auth_pam.c' || echo './'`auth_pam.c; \
        then mv -f ".deps/auth_pam_la-auth_pam.Tpo" ".deps/auth_pam_la-auth_pam.Plo"; else rm -f ".deps/auth_pam_la-auth_pam.Tpo"; exit 1; fi
../libtool: line 852: X--tag=CC: command not found
../libtool: line 885: libtool: ignoring unknown tag : command not found
../libtool: line 852: X--mode=compile: command not found
../libtool: line 1018: *** Warning: inferring the mode of operation is deprecated.: command not found
../libtool: line 1019: *** Future versions of Libtool will require --mode=MODE be specified.: command not found
../libtool: line 1162: Xgcc: command not found
../libtool: line 1162: X-DHAVE_CONFIG_H: command not found
../libtool: line 1162: X-I.: command not found
../libtool: line 1162: X-I.: command not found
../libtool: line 1162: X-I..: command not found
../libtool: line 1162: X-DMYSQL_DYNAMIC_PLUGIN: command not found
../libtool: line 1162: X-isystem: command not found
../libtool: line 1162: X/usr/include/mysql: No such file or directory
../libtool: line 1162: X-Wall: command not found
../libtool: line 1162: X-Wextra: command not found
../libtool: line 1162: X-g: command not found
../libtool: line 1162: X-O2: command not found
../libtool: line 1162: X-MT: command not found
../libtool: line 1162: Xauth_pam_la-auth_pam.lo: command not found
../libtool: line 1162: X-MD: command not found
../libtool: line 1162: X-MP: command not found
../libtool: line 1162: X-MF: command not found
../libtool: line 1162: X.deps/auth_pam_la-auth_pam.Tpo: No such file or directory
../libtool: line 1162: X-c: command not found
...

Read more...

review: Needs Fixing
Revision history for this message
Valentine Gostev (longbow) wrote :

Laurynas,

autoreconf -i -f
You should update your `aclocal.m4' by running aclocal.
configure.ac: installing `./install-sh'
configure.ac: installing `./missing'
src/Makefile.am: installing `./compile'
src/Makefile.am: installing `./depcomp'

This is a fresh checkout

Revision history for this message
Valentine Gostev (longbow) wrote :

If we use autoreconf with -f - build fails with the same error.
If we run aclocal as output advises, build will fail with

 cd . && /bin/sh /root/pam/source/autoreconf/missing --run automake-1.9 --foreign
cd . && /bin/sh /root/pam/source/autoreconf/missing --run autoconf
configure.ac:29: error: possibly undefined macro: AC_PROG_SED
      If this token and others are legitimate, please use m4_pattern_allow.
      See the Autoconf documentation.
make: *** [configure] Error 1

12. By Laurynas Biveinis

Fix bug 885305, bug 885311 (various bootstrap script bugs) by
rewriting that script in the proper way, which is using autoreconf.
To use it better, also do some changes to the build system itself:
- New directory m4 for m4 macros, specify it in configure.ac,
  Makefile.am and bootstrap.
- Set "foreign" project option for Automake.
- Use AS_HELP_STRING instead of obsolete AC_HELP_STRING.
- Remove AC_PROG_SED as it is not present on some pre-historic
  autoconfes.

Revision history for this message
Laurynas Biveinis (laurynas-biveinis) wrote :

CentOS 5.6 failures were caused by the erroneously committed libtool M4 macros. Removing them fixed the error.
Also removed AC_PROG_SED as it is not present on CentOS 5.6 (autoconf 2.59).
Also I have replaced obsolete AC_HELP_STRING with AS_HELP_STRING.

review: Needs Resubmitting
Revision history for this message
Valentine Gostev (longbow) wrote :

build looks fine

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches