From a921f558d9911047308914ae571882b01cb0f5a4 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 24 Jul 2023 00:10:08 +0200
Subject: [PATCH] Remove configure.in to configure.ac

This is the extension expected by all non-ancient autoconf versions.
---
 .gitattributes                                            | 3 +--
 Makefile.in                                               | 6 +++---
 acinclude.m4                                              | 2 +-
 build/aclocal/bakefile.m4                                 | 6 +++---
 build/autogen.mk                                          | 6 +++---
 build/bakefiles/config.bkl                                | 2 +-
 build/bakefiles/make_dist.mk                              | 6 +++---
 build/bakefiles/wxpresets/bakefile_quickstart.txt         | 4 ++--
 build/bakefiles/wxpresets/presets/wx_unix.bkl             | 2 +-
 build/tools/autoconf/README.md                            | 2 +-
 build/tools/build-wxwidgets.py                            | 2 +-
 configure                                                 | 2 +-
 configure.in => configure.ac                              | 2 +-
 .../about-platform-toolkit-and-library-names.md           | 2 +-
 docs/contributing/about-version-numbers.md                | 2 +-
 docs/contributing/how-to-add-files-to-build-system.md     | 6 +++---
 docs/contributing/how-to-add-new-sample.md                | 8 ++++----
 docs/contributing/how-to-add-new-wxUSE_XXX.md             | 2 +-
 docs/x11/install.md                                       | 2 +-
 misc/scripts/inc_release                                  | 2 +-
 src/common/arttango.cpp                                   | 2 +-
 wxwin.m4                                                  | 2 +-
 22 files changed, 36 insertions(+), 37 deletions(-)
 rename configure.in => configure.ac (99%)

diff --git a/.gitattributes b/.gitattributes
index d66b5737ca..4eb146520d 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -25,7 +25,6 @@
 *.h.in       eol=lf
 *.m4         eol=lf
 *.sh         eol=lf
-configure.in eol=lf
 Makefile.am  eol=lf
 Makefile.in  eol=lf
 makefile.unx eol=lf
@@ -33,7 +32,7 @@ makefile.unx eol=lf
 config.guess eol=lf
 config.sub   eol=lf
 configure    eol=lf
-configure.in eol=lf
+configure.ac eol=lf
 
 # Ignore changes in the generated files.
 build/upmake    -diff
diff --git a/Makefile.in b/Makefile.in
index 7ec5a42ffa..df665ef384 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -33955,7 +33955,7 @@ CP_P = cp -p
 ALL_DIST: distrib_clean
 	mkdir _dist_dir
 	mkdir $(DISTDIR)
-	$(CP_P) $(WXDIR)/configure.in $(DISTDIR)
+	$(CP_P) $(WXDIR)/configure.ac $(DISTDIR)
 	$(CP_P) $(WXDIR)/configure $(DISTDIR)
 	$(CP_P) $(WXDIR)/autoconf_inc.m4 $(DISTDIR)
 	$(CP_P) $(WXDIR)/wxwin.m4 $(DISTDIR)
@@ -34145,9 +34145,9 @@ ALL_GUI_DIST: ALL_DIST
 
 BASE_DIST: ALL_DIST INTL_DIST
 	# make --disable-gui the default
-	rm $(DISTDIR)/configure.in
+	rm $(DISTDIR)/configure.ac
 	sed 's/DEFAULT_wxUSE_GUI=yes/DEFAULT_wxUSE_GUI=no/' \
-		$(WXDIR)/configure.in > $(DISTDIR)/configure.in
+		$(WXDIR)/configure.ac > $(DISTDIR)/configure.ac
 	rm $(DISTDIR)/configure
 	sed 's/DEFAULT_wxUSE_GUI=yes/DEFAULT_wxUSE_GUI=no/' \
 		$(WXDIR)/configure > $(DISTDIR)/configure
diff --git a/acinclude.m4 b/acinclude.m4
index 507dae23ce..d8841d1f7e 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1,6 +1,6 @@
 dnl ---------------------------------------------------------------------------
 dnl
-dnl Macros for configure.in for wxWindows by Robert Roebling, Phil Blecker,
+dnl Macros for configure.ac for wxWindows by Robert Roebling, Phil Blecker,
 dnl Vadim Zeitlin and Ron Lee
 dnl
 dnl This script is under the wxWindows licence.
diff --git a/build/aclocal/bakefile.m4 b/build/aclocal/bakefile.m4
index c542c28d7f..b725db80b7 100644
--- a/build/aclocal/bakefile.m4
+++ b/build/aclocal/bakefile.m4
@@ -27,7 +27,7 @@ dnl
 
 dnl ---------------------------------------------------------------------------
 dnl Lots of compiler & linker detection code contained here was taken from
-dnl wxWidgets configure.in script (see https://www.wxwidgets.org)
+dnl wxWidgets configure script (see https://www.wxwidgets.org)
 dnl ---------------------------------------------------------------------------
 
 
@@ -658,7 +658,7 @@ AC_DEFUN([AC_BAKEFILE_PRECOMP_HEADERS],
 dnl ---------------------------------------------------------------------------
 dnl AC_BAKEFILE([autoconf_inc.m4 inclusion])
 dnl
-dnl To be used in configure.in of any project using Bakefile-generated mks
+dnl To be used in configure.ac of any project using Bakefile-generated mks
 dnl
 dnl Behaviour can be modified by setting following variables:
 dnl    BAKEFILE_CHECK_BASICS    set to "no" if you don't want bakefile to
@@ -716,7 +716,7 @@ AC_DEFUN([AC_BAKEFILE],
     $1
 
     if test "$BAKEFILE_AUTOCONF_INC_M4_VERSION" = "" ; then
-        AC_MSG_ERROR([No version found in autoconf_inc.m4 - bakefile macro was changed to take additional argument, perhaps configure.in wasn't updated (see the documentation)?])
+        AC_MSG_ERROR([No version found in autoconf_inc.m4 - bakefile macro was changed to take additional argument, perhaps configure.ac wasn't updated (see the documentation)?])
     fi
 
     if test "$BAKEFILE_BAKEFILE_M4_VERSION" != "$BAKEFILE_AUTOCONF_INC_M4_VERSION" ; then
diff --git a/build/autogen.mk b/build/autogen.mk
index da50527130..4da6c47154 100644
--- a/build/autogen.mk
+++ b/build/autogen.mk
@@ -59,8 +59,8 @@ autoconf_inc.m4 Makefile.in: $(BAKEFILES)
 	cd build/bakefiles && \
 	$(BAKEFILE_GEN) -f autoconf
 
-# Run configure whenever configure.in, aclocal.m4 or autoconf_inc.m4 is updated
-configure: configure.in aclocal.m4 autoconf_inc.m4
+# Run configure whenever configure.ac, aclocal.m4 or autoconf_inc.m4 is updated
+configure: configure.ac aclocal.m4 autoconf_inc.m4
 	$(AUTOCONF)
 
 ACLOCAL_SOURCES = \
@@ -74,6 +74,6 @@ ACLOCAL_SOURCES = \
   build/aclocal/visibility.m4
 
 # Run aclocal whenever acinclude or one of our local m4s is updated.
-aclocal.m4: configure.in acinclude.m4 $(ACLOCAL_SOURCES)
+aclocal.m4: configure.ac acinclude.m4 $(ACLOCAL_SOURCES)
 	$(ACLOCAL) -I build/aclocal
 
diff --git a/build/bakefiles/config.bkl b/build/bakefiles/config.bkl
index b938edb032..c0a4c94827 100644
--- a/build/bakefiles/config.bkl
+++ b/build/bakefiles/config.bkl
@@ -415,7 +415,7 @@ compiled .lib files and setup.h under the lib/ toplevel directory.
         <option name="SAMPLES_CXXFLAGS"/>
         <option name="USE_WEBVIEW_WEBKIT2"/>
 
-        <!-- see configure.in; it's required by some samples on Mac OS X -->
+        <!-- see configure.ac; it's required by some samples on Mac OS X -->
         <option name="HEADER_PAD_OPTION"/>
 
         <set var="TOP_SRCDIR">$(top_srcdir)/</set>
diff --git a/build/bakefiles/make_dist.mk b/build/bakefiles/make_dist.mk
index 8e0d698b32..191e53a4d1 100644
--- a/build/bakefiles/make_dist.mk
+++ b/build/bakefiles/make_dist.mk
@@ -75,7 +75,7 @@ CP_P = cp -p
 ALL_DIST: distrib_clean
 	mkdir _dist_dir
 	mkdir $(DISTDIR)
-	$(CP_P) $(WXDIR)/configure.in $(DISTDIR)
+	$(CP_P) $(WXDIR)/configure.ac $(DISTDIR)
 	$(CP_P) $(WXDIR)/configure $(DISTDIR)
 	$(CP_P) $(WXDIR)/autoconf_inc.m4 $(DISTDIR)
 	$(CP_P) $(WXDIR)/wxwin.m4 $(DISTDIR)
@@ -265,9 +265,9 @@ ALL_GUI_DIST: ALL_DIST
 
 BASE_DIST: ALL_DIST INTL_DIST
 	# make --disable-gui the default
-	rm $(DISTDIR)/configure.in
+	rm $(DISTDIR)/configure.ac
 	sed 's/DEFAULT_wxUSE_GUI=yes/DEFAULT_wxUSE_GUI=no/' \
-		$(WXDIR)/configure.in > $(DISTDIR)/configure.in
+		$(WXDIR)/configure.ac > $(DISTDIR)/configure.ac
 	rm $(DISTDIR)/configure
 	sed 's/DEFAULT_wxUSE_GUI=yes/DEFAULT_wxUSE_GUI=no/' \
 		$(WXDIR)/configure > $(DISTDIR)/configure
diff --git a/build/bakefiles/wxpresets/bakefile_quickstart.txt b/build/bakefiles/wxpresets/bakefile_quickstart.txt
index 03cabd5c7b..5c06e678c4 100644
--- a/build/bakefiles/wxpresets/bakefile_quickstart.txt
+++ b/build/bakefiles/wxpresets/bakefile_quickstart.txt
@@ -118,7 +118,7 @@ would like to build, separated by commas. Valid values are:
 TIP: autoconf Project Type
 ---------------------------
 You may notice that in the sample folder, there is also a file called
-configure.in. That file is the input for autoconf, which creates the configure
+configure.ac. That file is the input for autoconf, which creates the configure
 scripts that you often see when you build software from source on Unix-based
 platforms. People use configure scripts because they make your Unix makefiles
 more portable by automatically detecting the right libraries and commands to
@@ -126,7 +126,7 @@ use on the user's machine and OS. This is necessary because there are many
 Unix-based operating systems and they all are slightly different in various
 small ways.
 
-Bakefile does not generate a configure or configure.in script, so if you want
+Bakefile does not generate a configure or configure.ac script, so if you want
 to use configure scripts with your Unix-based software, you will need to learn
 how to use autoconf. Unfortunately, this topic deserves a book all its own and
 is beyond the scope of this tutorial, but a book on the subject can be found
diff --git a/build/bakefiles/wxpresets/presets/wx_unix.bkl b/build/bakefiles/wxpresets/presets/wx_unix.bkl
index 4f08c1a669..f48cd6e1eb 100644
--- a/build/bakefiles/wxpresets/presets/wx_unix.bkl
+++ b/build/bakefiles/wxpresets/presets/wx_unix.bkl
@@ -8,7 +8,7 @@ Format-specific notes:
 
 * autoconf:
         Beware that you have to use WX_CONFIG_OPTIONS and
-        WX_CONFIG_CHECK in your configure.in to get at least the
+        WX_CONFIG_CHECK in your configure.ac to get at least the
         WX_CPPFLAGS, WX_CFLAGS, WX_CXXFLAGS, WX_LIBS option values defined.
 
         To detect the WX_* option values typically you also want to use
diff --git a/build/tools/autoconf/README.md b/build/tools/autoconf/README.md
index 6066c427dd..a3b48730a0 100644
--- a/build/tools/autoconf/README.md
+++ b/build/tools/autoconf/README.md
@@ -27,7 +27,7 @@ Successfully tagged autoconf-for-wx:latest
 
 ## Run
 
-Use the following command to update `configure` from `configure.in`:
+Use the following command to update `configure` from `configure.ac`:
 
 ```shell
 $ docker run -v `pwd`:/wx --rm autoconf-for-wx
diff --git a/build/tools/build-wxwidgets.py b/build/tools/build-wxwidgets.py
index 16b8c4acbc..1bd6b47958 100755
--- a/build/tools/build-wxwidgets.py
+++ b/build/tools/build-wxwidgets.py
@@ -87,7 +87,7 @@ def getWxRelease(wxRoot=None):
         global wxRootDir
         wxRoot = wxRootDir
         
-    configureText = open(os.path.join(wxRoot, "configure.in"), "r").read()
+    configureText = open(os.path.join(wxRoot, "configure.ac"), "r").read()
     majorVersion = re.search("wx_major_version_number=(\d+)", configureText).group(1)
     minorVersion = re.search("wx_minor_version_number=(\d+)", configureText).group(1)
     
diff --git a/configure b/configure
index 5710e8590e..49b78b7bc9 100755
--- a/configure
+++ b/configure
@@ -43083,7 +43083,7 @@ EOF
 
 
     if test "$BAKEFILE_AUTOCONF_INC_M4_VERSION" = "" ; then
-        as_fn_error $? "No version found in autoconf_inc.m4 - bakefile macro was changed to take additional argument, perhaps configure.in wasn't updated (see the documentation)?" "$LINENO" 5
+        as_fn_error $? "No version found in autoconf_inc.m4 - bakefile macro was changed to take additional argument, perhaps configure.ac wasn't updated (see the documentation)?" "$LINENO" 5
     fi
 
     if test "$BAKEFILE_BAKEFILE_M4_VERSION" != "$BAKEFILE_AUTOCONF_INC_M4_VERSION" ; then
diff --git a/configure.in b/configure.ac
similarity index 99%
rename from configure.in
rename to configure.ac
index d20245605f..dec031485a 100644
--- a/configure.in
+++ b/configure.ac
@@ -3,7 +3,7 @@ AC_PREREQ(2.58)
 
 dnl ---------------------------------------------------------------------------
 dnl
-dnl Top-level configure.in for wxWidgets by Robert Roebling, Phil Blecker,
+dnl Top-level configure.ac for wxWidgets by Robert Roebling, Phil Blecker,
 dnl Vadim Zeitlin and Ron Lee
 dnl
 dnl This script is under the wxWindows licence.
diff --git a/docs/contributing/about-platform-toolkit-and-library-names.md b/docs/contributing/about-platform-toolkit-and-library-names.md
index 3929f22c42..13183a269c 100644
--- a/docs/contributing/about-platform-toolkit-and-library-names.md
+++ b/docs/contributing/about-platform-toolkit-and-library-names.md
@@ -75,7 +75,7 @@ compatibility is maintained between point releases (those with the same
 major.minor number).
 
 A known break in binary compatibility should be addressed by updating
-the library soname (see the notes in configure.in for details on this).
+the library soname (see the notes in configure.ac for details on this).
 
 --------------------------------------------------------------------
 
diff --git a/docs/contributing/about-version-numbers.md b/docs/contributing/about-version-numbers.md
index 63df418e19..513af66503 100644
--- a/docs/contributing/about-version-numbers.md
+++ b/docs/contributing/about-version-numbers.md
@@ -16,7 +16,7 @@ instructions there.
 Here is the list of files that need to be updated:
 
 - build/bakefiles/version.bkl {C:R:A}          [NOT UPDATED AUTOMATICALLY]
-- configure.in
+- configure.ac
 - build/osx/wxvers.xcconfig
 - docs/changes.txt
 - docs/readme.txt (date needs manual editing)  [NOT UPDATED AUTOMATICALLY]
diff --git a/docs/contributing/how-to-add-files-to-build-system.md b/docs/contributing/how-to-add-files-to-build-system.md
index de3f167084..454c87ecc0 100644
--- a/docs/contributing/how-to-add-files-to-build-system.md
+++ b/docs/contributing/how-to-add-files-to-build-system.md
@@ -180,11 +180,11 @@ d) Modify multilib.bkl to add files to multilib build: add foolib and foodll
 
 e) Regenerate all makefiles (don't forget to run autoconf)
 
-f) Update configure.in and wx-config.in to contain information about
+f) Update configure.ac and wx-config.in to contain information about
    the library and needed linker flags:
-   * Add "foo" to `BUILT_WX_LIBS` in configure.in.
+   * Add "foo" to `BUILT_WX_LIBS` in configure.ac.
    * If appropriate, but it rarely is, so normally this should _not_ be done,
-     add "foo" to either `STD_BASE_LIBS` or `STD_GUI_LIBS` in configure.in.
+     add "foo" to either `STD_BASE_LIBS` or `STD_GUI_LIBS` in configure.ac.
    * If wxFoo links against additional libraries, add necessary linker
      flags and libraries to ldflags_foo and ldlibs_foo variables in
      wx-config.in (both are optional).
diff --git a/docs/contributing/how-to-add-new-sample.md b/docs/contributing/how-to-add-new-sample.md
index fe67c3a918..52e55caf17 100644
--- a/docs/contributing/how-to-add-new-sample.md
+++ b/docs/contributing/how-to-add-new-sample.md
@@ -36,15 +36,15 @@ samples/ with demos/ where needed).
       compiler (run `bakefile --help` to get the list of possible values).
       Again, see `how-to-add-files-to-build-system.md` for more information.
 
-4. Modify configure.in Unix compilation:
+4. Modify configure.ac Unix compilation:
    - if the sample should only be built if `wxUSE_FOO` is enabled, locate
-      the test for `wxUSE_FOO = yes` in configure.in and add a line
+      the test for `wxUSE_FOO = yes` in configure.ac and add a line
       `SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS foo"` under it
    - if it should be always built, locate the line `if test $wxUSE_GUI = yes`
-     near the end of configure.in and modify the assignment to
+     near the end of configure.ac and modify the assignment to
      `SAMPLES_SUBDIRS` to include "foo" (put in alphabetical order)
 
-   After this, regenerate configure from configure.in
+   After this, regenerate configure from configure.ac
    by running "autoconf" on a Unix system in the corresponding directory.
 
 5. Modify `build/cmake/samples/CMakeLists.txt` to include the sample in
diff --git a/docs/contributing/how-to-add-new-wxUSE_XXX.md b/docs/contributing/how-to-add-new-wxUSE_XXX.md
index 316dfc48ec..ae5d1cf075 100644
--- a/docs/contributing/how-to-add-new-wxUSE_XXX.md
+++ b/docs/contributing/how-to-add-new-wxUSE_XXX.md
@@ -58,7 +58,7 @@ The following files need to be modified when adding a new `wxUSE_FOO`:
    These options won't be defined for the other ports, so shouldn't be added to
    the common `include/wx/chkconf.h` but to this file instead.
 
-- `configure.in`
+- `configure.ac`
 
    Here you need to add `DEFAULT_wxUSE_FOO` define. It should be added in the
    block beginning after `WX_ARG_CACHE_INIT` line and should default to "no" for
diff --git a/docs/x11/install.md b/docs/x11/install.md
index a04fffe7d4..5e97a51de5 100644
--- a/docs/x11/install.md
+++ b/docs/x11/install.md
@@ -393,7 +393,7 @@ automatically using wx-config
 2. The other way creates a project within the source code
 directories of wxWidgets. For this endeavour, you'll need
 GNU autoconf version 2.14 and add an entry to your Makefile.in
-to the bottom of the configure.in script and run autoconf
+to the bottom of the configure.ac script and run autoconf
 and configure before you can type make.
 
 Further notes by Julian Smart          {#x11_notes}
diff --git a/misc/scripts/inc_release b/misc/scripts/inc_release
index bb7790941e..2144cccdd0 100755
--- a/misc/scripts/inc_release
+++ b/misc/scripts/inc_release
@@ -25,7 +25,7 @@ msg "Updating version to $ver_string_new"
 
 ver_for_sed="$ver_major\.$ver_minor\.$ver_release"
 
-run_sed configure.in \
+run_sed configure.ac \
     "/^AC_INIT/s/$ver_for_sed/$ver_string_new/" \
     "s/^wx_release_number=$ver_release/wx_release_number=$ver_release_new/" \
     "s/^wx_subrelease_number=.*$/wx_subrelease_number=0/"
diff --git a/src/common/arttango.cpp b/src/common/arttango.cpp
index 30f0cdf78a..d1e54e7569 100644
--- a/src/common/arttango.cpp
+++ b/src/common/arttango.cpp
@@ -198,7 +198,7 @@ wxTangoArtProvider::CreateBitmapBundle(const wxArtID& id,
 
         // Note: when adding elements here, try to also add the corresponding
         //       icon to src/gtk/artgtk.cpp as the GTK art provider is supposed
-        //       to have all the icons the Tango provider has, see configure.in.
+        //       to have all the icons the Tango provider has, see configure.ac.
     };
 
     #undef BITMAP_DATA
diff --git a/wxwin.m4 b/wxwin.m4
index fc44451d6d..8ce6a21ae7 100644
--- a/wxwin.m4
+++ b/wxwin.m4
@@ -37,7 +37,7 @@ dnl ===========================================================================
 
 
 dnl ---------------------------------------------------------------------------
-dnl Macros for wxWidgets detection. Typically used in configure.in as:
+dnl Macros for wxWidgets detection. Typically used in configure.ac as:
 dnl
 dnl     AC_ARG_ENABLE(...)
 dnl     AC_ARG_WITH(...)