Deal with warnings given by automake 1.12.

git-svn-id: svn://vcs.exim.org/pcre/code/trunk@1240 2f5784b3-3f2a-0410-8824-cb99058d5e15

3 files changed, 11 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index 90fc494..74a3f31 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -28,6 +28,9 @@ Version 8.33 xx-xxxx-201x
 
 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
diff --git a/autogen.sh b/autogen.sh
index 8a69c22..0d5a55f 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -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,7 +33,11 @@ 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
+
+# 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
diff --git a/configure.ac b/configure.ac
index 2b012b9..99f07f0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -30,6 +30,9 @@ AM_INIT_AUTOMAKE([dist-bzip2 dist-zip])
 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])