The name configure.in has been deprecated for many years.

Use configure.ac instead.

svn path=/trunk/; revision=44630

7 files changed, 16 insertions, 16 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c650a64fe0..dfbbab1a0c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -36,10 +36,10 @@ endif(COMMAND cmake_policy)
 # set(PROJECT_VERSION "1.3.4-rc5")
 # set(PROJECT_VERSION "1.3.4rc5")
 # set(PROJECT_VERSION "1.3.4")
-# If not set, copy over Wireshark version from configure.in AC_INIT
+# If not set, copy over Wireshark version from configure.ac AC_INIT
 if(NOT PROJECT_VERSION)
 	file(STRINGS
-		${CMAKE_SOURCE_DIR}/configure.in
+		${CMAKE_SOURCE_DIR}/configure.ac
 		VERSIONLINE
 		REGEX "\\(wireshark, .*\\)"
 	)
diff --git a/INSTALL.configure b/INSTALL.configure
index b42a17ac46..ef77c3a46f 100644
--- a/INSTALL.configure
+++ b/INSTALL.configure
@@ -19,8 +19,8 @@ diffs or instructions to the address given in the `README' so they can
 be considered for the next release.  If at some point `config.cache'
 contains results you don't want to keep, you may remove or edit it.
 
-   The file `configure.in' is used to create `configure' by a program
-called `autoconf'.  You only need `configure.in' if you want to change
+   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'.
 
 The simplest way to compile this package is:
diff --git a/README.aix b/README.aix
index 775c88058d..f961aaa96e 100644
--- a/README.aix
+++ b/README.aix
@@ -103,7 +103,7 @@ Hi,
 
 After much sweat and toil, I have managed to get gtk 1.2.6 to
 compile and not dump core under AIX.  The solutions were to
-(1) apply the attached patch to the configure.in in the glib-1.2.6
+(1) apply the attached patch to the configure.ac in the glib-1.2.6
 subdirectory
 
 (2)  In the file gtk+-1.2.6/gtk/Makefile, add a link flag -lgdk to link
@@ -129,8 +129,8 @@ Craig Rodrigues
 http://www.gis.net/~craigr    
 rodrigc@mediaone.net          
 
-*** configure.in.old    Thu Oct  7 17:27:43 1999
---- configure.in        Sun Nov  7 19:34:36 1999
+*** configure.ac.old    Thu Oct  7 17:27:43 1999
+--- configure.ac        Sun Nov  7 19:34:36 1999
 ***************
 *** 795,809 ****
 	  fi
diff --git a/README.irix b/README.irix
index e21b4512e4..8b3b455aa5 100644
--- a/README.irix
+++ b/README.irix
@@ -36,7 +36,7 @@ PROBLEM #1
    BETTER SOLUTION:  Modify configure to support RPATH for more platforms
                      than Solaris.
 
-[NOTE: configure is generated from configure.in and acinclude.m4, and
+[NOTE: configure is generated from configure.ac and acinclude.m4, and
 all the linking stuff is done by libtool.  We don't recommend the
 LD_LIBRARY_PATH hack - perhaps we did so in the past, but we don't do so
 now.]
diff --git a/config.h.win32 b/config.h.win32
index 82130b2b50..c1acfd936b 100644
--- a/config.h.win32
+++ b/config.h.win32
@@ -1,7 +1,7 @@
 /* $Id$ */
 /* config.h.win32.  Generated manually. :-) */
 /* config.h.  Generated automatically by configure.  */
-/* config.h.in.  Generated automatically from configure.in by autoheader.  */
+/* config.h.in.  Generated automatically from configure.ac by autoheader.  */
 
 /* Generated Bison and Flex files test whether __STDC__ is defined
    in order to check whether to use ANSI C features such as "const".
diff --git a/configure.in b/configure.ac
index b3ddc3af3e..8a8c07dd64 100644
--- a/configure.in
+++ b/configure.ac
@@ -1939,7 +1939,7 @@ AC_SUBST(wireshark_SUBDIRS)
 
 dnl
 dnl check whether plugins should be enabled and, if they should be,
-dnl check for plugins directory - stolen from Amanda's configure.in
+dnl check for plugins directory - stolen from Amanda's configure.ac
 dnl
 dnl we don't wish to expand ${libdir} yet
 plugindir='${libdir}/wireshark/plugins/${VERSION}'
diff --git a/make-version.pl b/make-version.pl
index 4fc9988879..c6243d542f 100755
--- a/make-version.pl
+++ b/make-version.pl
@@ -37,7 +37,7 @@
 #   pkg_format - Like "format", but used for the local package version.
 #
 # If run with the "-r" or "--set-release" argument the AC_INIT macro in
-# configure.in and the VERSION macro in config.nmake will have the
+# configure.ac and the VERSION macro in config.nmake will have the
 # pkg_format template appended to the version number. svnversion.h will
 # _not_ be generated if either argument is present.
 #
@@ -253,12 +253,12 @@ Fin
 
 # Read configure.in, then write it back out with an updated
 # "AC_INIT" line.
-sub update_configure_in
+sub update_configure_ac
 {
 	my $line;
 	my $contents = "";
 	my $version = "";
-	my $filepath = "$srcdir/configure.in";
+	my $filepath = "$srcdir/configure.ac";
 
 	return if (!$set_version && $package_string eq "");
 
@@ -441,7 +441,7 @@ sub update_lib_releases
 # Update distributed files that contain any version information
 sub update_versioned_files
 {
-	&update_configure_in;
+	&update_configure_ac;
 	&update_config_nmake;
 	&update_release_notes;
 	&update_debian_changelog;
@@ -573,11 +573,11 @@ make-version.pl [options] [source directory]
     --get-svn, -g              Print the SVN revision and source.
     --set-svn, -s              Set the information in svnversion.h
     --set-version, -v          Set the major, minor, and micro versions in
-                               configure.in, config.nmake, debian/changelog,
+                               configure.ac, config.nmake, debian/changelog,
 			       and docbook/release_notes.xml.
                                Resets the release information when used by
 			       itself.
-    --set-release, -r          Set the release information in configure.in
+    --set-release, -r          Set the release information in configure.ac
                                and config.nmake
     --package-version, -p      Deprecated. Same as --set-release.