Revision: 1240
http://vcs.pcre.org/viewvc?view=rev&revision=1240
Author: ph10
Date: 2013-01-23 16:36:41 +0000 (Wed, 23 Jan 2013)
Log Message:
-----------
Deal with warnings given by automake 1.12.
Modified Paths:
--------------
code/trunk/ChangeLog
code/trunk/autogen.sh
code/trunk/configure.ac
Modified: code/trunk/ChangeLog
===================================================================
--- code/trunk/ChangeLog 2013-01-18 08:20:44 UTC (rev 1239)
+++ code/trunk/ChangeLog 2013-01-23 16:36:41 UTC (rev 1240)
@@ -28,6 +28,9 @@
6. Fix forward search in JIT when link size is 3 or greater. Also removed some
unnecessary spaces.
+
+7. Adjust autogen.sh and configure.ac to lose warnings given by automake 1.12
+ and later.
Version 8.32 30-November-2012
Modified: code/trunk/autogen.sh
===================================================================
--- code/trunk/autogen.sh 2013-01-18 08:20:44 UTC (rev 1239)
+++ code/trunk/autogen.sh 2013-01-23 16:36:41 UTC (rev 1240)
@@ -6,10 +6,6 @@
# 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)
@@ -37,8 +33,12 @@
aclocal --force -I m4
autoconf -f -W all,no-obsolete
autoheader -f -W all
-automake -a -c -f -W all
+# Added no-portability to suppress automake 1.12's warning about the use
+# of recursive variables.
+
+automake -a -c -f -W all,no-portability
+
rm -rf autom4te.cache
exit 0
Modified: code/trunk/configure.ac
===================================================================
--- code/trunk/configure.ac 2013-01-18 08:20:44 UTC (rev 1239)
+++ code/trunk/configure.ac 2013-01-23 16:36:41 UTC (rev 1240)
@@ -30,6 +30,9 @@
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
AC_CONFIG_HEADERS(config.h)
+# This is a new thing required to stop a warning from automake 1.12
+m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
+
# This was added at the suggestion of libtoolize (03-Jan-10)
AC_CONFIG_MACRO_DIR([m4])
