From: Amos Jeffries <squid3@treenet.co.nz>
Date: Fri, 10 Dec 2010 09:59:02 +0000 (-0700)
Subject: Remove/update references to configure.in
X-Git-Tag: take1~10
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a6093a2dbb4f14c729dc21d7d3f939facdd68c5b;p=thirdparty%2Fsquid.git

Remove/update references to configure.in
---

diff --git a/acinclude/krb5.m4 b/acinclude/krb5.m4
index 22c151de39..19dfd31668 100644
--- a/acinclude/krb5.m4
+++ b/acinclude/krb5.m4
@@ -27,7 +27,7 @@ dnl along with this program; if not, write to the Free Software
 dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
 
 dnl these checks must be performed in the same order as here defined,
-dnl and have mostly been lifted out of an inlined configure.in.
+dnl and have mostly been lifted out of an inlined configure.ac.
 
 dnl checks for a broken solaris header file, and sets squid_cv_broken_krb5_h
 dnl to yes if that's the case
diff --git a/lib/libTrie/INSTALL b/lib/libTrie/INSTALL
index a4b34144dc..46dd6d005f 100644
--- a/lib/libTrie/INSTALL
+++ b/lib/libTrie/INSTALL
@@ -31,7 +31,7 @@ be considered for the next release.  If you are using the cache, and at
 some point `config.cache' contains results you don't want to keep, you
 may remove or edit it.
 
-   The file `configure.ac' (or `configure.in') is used to create
+   The file `configure.ac' is used to create
 `configure' by a program called `autoconf'.  You only need
 `configure.ac' if you want to change it or regenerate `configure' using
 a newer version of `autoconf'.
diff --git a/mkrelease.sh b/mkrelease.sh
index d1e8c3df70..9ddb8ee297 100755
--- a/mkrelease.sh
+++ b/mkrelease.sh
@@ -53,7 +53,7 @@ if [ ${name} != ${PACKAGE}-${VERSION} ]; then
 	exit 1
 fi
 RELEASE=`echo $VERSION | cut -d. -f1,2 | cut -d- -f1`
-ed -s configure.in <<EOS
+ed -s configure.ac <<EOS
 g/${VERSION}-BZR/ s//${VERSION}/
 w
 EOS
diff --git a/mksnapshot.sh b/mksnapshot.sh
index 89b38d80d8..8254362159 100755
--- a/mksnapshot.sh
+++ b/mksnapshot.sh
@@ -25,7 +25,7 @@ trap "echo FAIL-BUILD_${VERSION} ; rm -rf ${tmpdir}" 0
 
 rm -f ${tag}.out
 bzr export ${tmpdir} ${BZRROOT}/${module}/${branchpath} || exit 1
-if [ ! -f ${tmpdir}/configure ] && [ -f ${tmpdir}/configure.in ]; then
+if [ ! -f ${tmpdir}/configure ] && [ -f ${tmpdir}/configure.ac ]; then
 	sh -c "cd ${tmpdir} && ./bootstrap.sh"
 fi
 if [ ! -f ${tmpdir}/configure ]; then
@@ -35,7 +35,7 @@ fi
 cd ${tmpdir}
 eval `grep "^ *PACKAGE_VERSION=" configure | sed -e 's/-BZR//' | sed -e 's/PACKAGE_//'`
 eval `grep "^ *PACKAGE_TARNAME=" configure | sed -e 's/_TARNAME//'`
-ed -s configure.in <<EOS
+ed -s configure.ac <<EOS
 g/${VERSION}-[A-Z]*/ s//${VERSION}-${date}/
 w
 EOS
diff --git a/src/StoreFileSystem.h b/src/StoreFileSystem.h
index 7702b6be7e..586ef6113d 100644
--- a/src/StoreFileSystem.h
+++ b/src/StoreFileSystem.h
@@ -63,10 +63,10 @@
  \par
  * The storage types live in \em src/fs/. Each subdirectory corresponds
  * to the name of the storage type. When a new storage type is implemented
- * configure.in must be updated to autogenerate a Makefile in
+ * configure.ac must be updated to autogenerate a Makefile in
  * \em src/fs/foo/ from a Makefile.in file.
  *
- \todo DOCS: add template addition to configure.in for storage module addition.
+ \todo DOCS: add template addition to configure.ac for storage module addition.
  \todo DOCS: add template Makefile.am for storage module addition.
  *
  \par
diff --git a/test-suite/buildtests/layer-01-minimal.opts b/test-suite/buildtests/layer-01-minimal.opts
index 46c1ab4ea6..3e9096c75a 100644
--- a/test-suite/buildtests/layer-01-minimal.opts
+++ b/test-suite/buildtests/layer-01-minimal.opts
@@ -9,11 +9,11 @@
 MAKETEST="distcheck"
 #
 #
-# The options for this level can be easily generated semi-automatically from configure.in by:
-#	grep -E "^AC_ARG_ENABLE" ./configure.in | grep -o -E "[0-9a-z\-]+[,]" | grep -o -E "[^,]+" >disable.opts
+# The options for this level can be easily generated semi-automatically from configure.ac by:
+#	grep -E "^AC_ARG_ENABLE" ./configure.ac | grep -o -E "[0-9a-z\-]+[,]" | grep -o -E "[^,]+" >disable.opts
 # followed by insertion of '	--disable-' and '\' strings
 #
-# 	grep -E "^AC_ARG_WITH" ./configure.in | grep -o -E "[0-9a-z\-]+[,]" | grep -o -E "[^,]+" >without.opts
+# 	grep -E "^AC_ARG_WITH" ./configure.ac | grep -o -E "[0-9a-z\-]+[,]" | grep -o -E "[^,]+" >without.opts
 # followed by insertion of '	--without-' and ' \' strings
 #
 # sometimes it's just too automatic.. Following options should be just stripped
diff --git a/test-suite/buildtests/layer-02-maximus.opts b/test-suite/buildtests/layer-02-maximus.opts
index bc9a7e726d..c7360d6fbd 100644
--- a/test-suite/buildtests/layer-02-maximus.opts
+++ b/test-suite/buildtests/layer-02-maximus.opts
@@ -9,11 +9,11 @@
 MAKETEST="distcheck"
 #
 #
-# The options for this level can be easily generated semi-automatically from configure.in by:
-#	grep -E "^AC_ARG_ENABLE" ./configure.in | grep -o -E "[0-9a-z\-]+[,]" | grep -o -E "[^,]+" >disable.opts
+# The options for this level can be easily generated semi-automatically from configure.ac by:
+#	grep -E "^AC_ARG_ENABLE" ./configure.ac | grep -o -E "[0-9a-z\-]+[,]" | grep -o -E "[^,]+" >disable.opts
 # followed by insertion of '	--enable-' and '\' strings
 #
-# 	grep -E "^AC_ARG_WITH" ./configure.in | grep -o -E "[0-9a-z\-]+[,]" | grep -o -E "[^,]+" >without.opts
+# 	grep -E "^AC_ARG_WITH" ./configure.ac | grep -o -E "[0-9a-z\-]+[,]" | grep -o -E "[^,]+" >without.opts
 # followed by insertion of '	--with-' and ' \' strings
 #
 # sometimes it's just too automatic..