Revision: 1037
http://vcs.pcre.org/viewvc?view=rev&revision=1037
Author: ph10
Date: 2012-09-12 09:30:17 +0100 (Wed, 12 Sep 2012)
Log Message:
-----------
Re-order commands so that libtoolize comes before aclocal.
Modified Paths:
--------------
code/trunk/autogen.sh
Modified: code/trunk/autogen.sh
===================================================================
--- code/trunk/autogen.sh 2012-09-12 07:57:11 UTC (rev 1036)
+++ code/trunk/autogen.sh 2012-09-12 08:30:17 UTC (rev 1037)
@@ -1,9 +1,15 @@
#!/bin/sh
-set -ex
-rm -rf autom4te.cache Makefile.in aclocal.m4
-aclocal --force -I m4
+# Running aclocal here first (as happened for a while) caused the macros that
+# libtoolize puts in the m4 directory to be newer than the aclocal.m4 file that
+# aclocal creates. This meant that the next "make" cause aclocal to be run
+# again. Moving aclocal to after libtoolize does not seem to cause any
+# problems, and it fixes this issue.
+#set -ex
+#rm -rf autom4te.cache Makefile.in aclocal.m4
+#aclocal --force -I m4
+
# GNU libtool is named differently on some systems. This code tries several
# variants like glibtoolize (MacOSX) and libtoolize1x (FreeBSD)
@@ -27,6 +33,8 @@
set -ex
$libtoolize -c -f
+rm -rf autom4te.cache Makefile.in aclocal.m4
+aclocal --force -I m4
autoconf -f -W all,no-obsolete
autoheader -f -W all
automake -a -c -f -W all
