solemnwarning/wxwidgets
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Remove configure.in to configure.ac

Browse source 
This is the extension expected by all non-ancient autoconf versions.
This commit is contained in:
Vadim Zeitlin 2023-07-24 00:10:08 +02:00
parent 5c3a41139c
commit a921f558d9
22 changed files with 36 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

3
.gitattributes vendored
View file

@ -25,7 +25,6 @@
*.h.in eol=lf *.h.in eol=lf
*.m4 eol=lf *.m4 eol=lf
*.sh eol=lf *.sh eol=lf
configure.in eol=lf
Makefile.am eol=lf Makefile.am eol=lf
Makefile.in eol=lf Makefile.in eol=lf
makefile.unx eol=lf makefile.unx eol=lf
@ -33,7 +32,7 @@ makefile.unx eol=lf
config.guess eol=lf config.guess eol=lf
config.sub eol=lf config.sub eol=lf
configure eol=lf configure eol=lf
configure.in eol=lf configure.ac eol=lf
# Ignore changes in the generated files. # Ignore changes in the generated files.
build/upmake -diff build/upmake -diff

6
Makefile.in
View file

@ -33955,7 +33955,7 @@ CP_P = cp -p
ALL_DIST: distrib_clean ALL_DIST: distrib_clean
mkdir _dist_dir mkdir _dist_dir
mkdir $(DISTDIR) mkdir $(DISTDIR)
$(CP_P) $(WXDIR)/configure.in $(DISTDIR) $(CP_P) $(WXDIR)/configure.ac $(DISTDIR)
$(CP_P) $(WXDIR)/configure $(DISTDIR) $(CP_P) $(WXDIR)/configure $(DISTDIR)
$(CP_P) $(WXDIR)/autoconf_inc.m4 $(DISTDIR) $(CP_P) $(WXDIR)/autoconf_inc.m4 $(DISTDIR)
$(CP_P) $(WXDIR)/wxwin.m4 $(DISTDIR) $(CP_P) $(WXDIR)/wxwin.m4 $(DISTDIR)
@ -34145,9 +34145,9 @@ ALL_GUI_DIST: ALL_DIST
BASE_DIST: ALL_DIST INTL_DIST BASE_DIST: ALL_DIST INTL_DIST
# make --disable-gui the default # make --disable-gui the default
rm $(DISTDIR)/configure.in rm $(DISTDIR)/configure.ac
sed 's/DEFAULT_wxUSE_GUI=yes/DEFAULT_wxUSE_GUI=no/' \ 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 rm $(DISTDIR)/configure
sed 's/DEFAULT_wxUSE_GUI=yes/DEFAULT_wxUSE_GUI=no/' \ sed 's/DEFAULT_wxUSE_GUI=yes/DEFAULT_wxUSE_GUI=no/' \
$(WXDIR)/configure > $(DISTDIR)/configure $(WXDIR)/configure > $(DISTDIR)/configure

2
acinclude.m4
View file

@ -1,6 +1,6 @@
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
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 Vadim Zeitlin and Ron Lee
dnl dnl
dnl This script is under the wxWindows licence. dnl This script is under the wxWindows licence.

6
build/aclocal/bakefile.m4
View file

@ -27,7 +27,7 @@ dnl
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
dnl Lots of compiler & linker detection code contained here was taken from 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 --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
@ -658,7 +658,7 @@ AC_DEFUN([AC_BAKEFILE_PRECOMP_HEADERS],
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
dnl AC_BAKEFILE([autoconf_inc.m4 inclusion]) dnl AC_BAKEFILE([autoconf_inc.m4 inclusion])
dnl 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
dnl Behaviour can be modified by setting following variables: dnl Behaviour can be modified by setting following variables:
dnl BAKEFILE_CHECK_BASICS set to "no" if you don't want bakefile to dnl BAKEFILE_CHECK_BASICS set to "no" if you don't want bakefile to
@ -716,7 +716,7 @@ AC_DEFUN([AC_BAKEFILE],
$1 $1
if test "$BAKEFILE_AUTOCONF_INC_M4_VERSION" = "" ; then 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 fi
if test "$BAKEFILE_BAKEFILE_M4_VERSION" != "$BAKEFILE_AUTOCONF_INC_M4_VERSION" ; then if test "$BAKEFILE_BAKEFILE_M4_VERSION" != "$BAKEFILE_AUTOCONF_INC_M4_VERSION" ; then

6
build/autogen.mk
View file

@ -59,8 +59,8 @@ autoconf_inc.m4 Makefile.in: $(BAKEFILES)
cd build/bakefiles && \ cd build/bakefiles && \
$(BAKEFILE_GEN) -f autoconf $(BAKEFILE_GEN) -f autoconf
# Run configure whenever configure.in, aclocal.m4 or autoconf_inc.m4 is updated # Run configure whenever configure.ac, aclocal.m4 or autoconf_inc.m4 is updated
configure: configure.in aclocal.m4 autoconf_inc.m4 configure: configure.ac aclocal.m4 autoconf_inc.m4
$(AUTOCONF) $(AUTOCONF)
ACLOCAL_SOURCES = \ ACLOCAL_SOURCES = \
@ -74,6 +74,6 @@ ACLOCAL_SOURCES = \
build/aclocal/visibility.m4 build/aclocal/visibility.m4
# Run aclocal whenever acinclude or one of our local m4s is updated. # 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 $(ACLOCAL) -I build/aclocal

2
build/bakefiles/config.bkl
View file

@ -415,7 +415,7 @@ compiled .lib files and setup.h under the lib/ toplevel directory.
<option name="SAMPLES_CXXFLAGS"/> <option name="SAMPLES_CXXFLAGS"/>
<option name="USE_WEBVIEW_WEBKIT2"/> <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"/> <option name="HEADER_PAD_OPTION"/>
<set var="TOP_SRCDIR">$(top_srcdir)/</set> <set var="TOP_SRCDIR">$(top_srcdir)/</set>

6
build/bakefiles/make_dist.mk
View file

@ -75,7 +75,7 @@ CP_P = cp -p
ALL_DIST: distrib_clean ALL_DIST: distrib_clean
mkdir _dist_dir mkdir _dist_dir
mkdir $(DISTDIR) mkdir $(DISTDIR)
$(CP_P) $(WXDIR)/configure.in $(DISTDIR) $(CP_P) $(WXDIR)/configure.ac $(DISTDIR)
$(CP_P) $(WXDIR)/configure $(DISTDIR) $(CP_P) $(WXDIR)/configure $(DISTDIR)
$(CP_P) $(WXDIR)/autoconf_inc.m4 $(DISTDIR) $(CP_P) $(WXDIR)/autoconf_inc.m4 $(DISTDIR)
$(CP_P) $(WXDIR)/wxwin.m4 $(DISTDIR) $(CP_P) $(WXDIR)/wxwin.m4 $(DISTDIR)
@ -265,9 +265,9 @@ ALL_GUI_DIST: ALL_DIST
BASE_DIST: ALL_DIST INTL_DIST BASE_DIST: ALL_DIST INTL_DIST
# make --disable-gui the default # make --disable-gui the default
rm $(DISTDIR)/configure.in rm $(DISTDIR)/configure.ac
sed 's/DEFAULT_wxUSE_GUI=yes/DEFAULT_wxUSE_GUI=no/' \ 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 rm $(DISTDIR)/configure
sed 's/DEFAULT_wxUSE_GUI=yes/DEFAULT_wxUSE_GUI=no/' \ sed 's/DEFAULT_wxUSE_GUI=yes/DEFAULT_wxUSE_GUI=no/' \
$(WXDIR)/configure > $(DISTDIR)/configure $(WXDIR)/configure > $(DISTDIR)/configure

4
build/bakefiles/wxpresets/bakefile_quickstart.txt
View file

@ -118,7 +118,7 @@ would like to build, separated by commas. Valid values are:
TIP: autoconf Project Type TIP: autoconf Project Type
--------------------------- ---------------------------
You may notice that in the sample folder, there is also a file called 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 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 platforms. People use configure scripts because they make your Unix makefiles
more portable by automatically detecting the right libraries and commands to 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 Unix-based operating systems and they all are slightly different in various
small ways. 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 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 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 is beyond the scope of this tutorial, but a book on the subject can be found

2
build/bakefiles/wxpresets/presets/wx_unix.bkl
View file

@ -8,7 +8,7 @@ Format-specific notes:
* autoconf: * autoconf:
Beware that you have to use WX_CONFIG_OPTIONS and 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. WX_CPPFLAGS, WX_CFLAGS, WX_CXXFLAGS, WX_LIBS option values defined.
To detect the WX_* option values typically you also want to use To detect the WX_* option values typically you also want to use

2
build/tools/autoconf/README.md
View file

@ -27,7 +27,7 @@ Successfully tagged autoconf-for-wx:latest
## Run ## Run
Use the following command to update `configure` from `configure.in`: Use the following command to update `configure` from `configure.ac`:
```shell ```shell
$ docker run -v `pwd`:/wx --rm autoconf-for-wx $ docker run -v `pwd`:/wx --rm autoconf-for-wx

2
build/tools/build-wxwidgets.py
View file

@ -87,7 +87,7 @@ def getWxRelease(wxRoot=None):
global wxRootDir global wxRootDir
wxRoot = 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) majorVersion = re.search("wx_major_version_number=(\d+)", configureText).group(1)
minorVersion = re.search("wx_minor_version_number=(\d+)", configureText).group(1) minorVersion = re.search("wx_minor_version_number=(\d+)", configureText).group(1)

2
configure vendored
View file

@ -43083,7 +43083,7 @@ EOF
if test "$BAKEFILE_AUTOCONF_INC_M4_VERSION" = "" ; then 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 fi
if test "$BAKEFILE_BAKEFILE_M4_VERSION" != "$BAKEFILE_AUTOCONF_INC_M4_VERSION" ; then if test "$BAKEFILE_BAKEFILE_M4_VERSION" != "$BAKEFILE_AUTOCONF_INC_M4_VERSION" ; then

2
configure.in → configure.ac
View file

@ -3,7 +3,7 @@ AC_PREREQ(2.58)
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
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 Vadim Zeitlin and Ron Lee
dnl dnl
dnl This script is under the wxWindows licence. dnl This script is under the wxWindows licence.

2
docs/contributing/about-platform-toolkit-and-library-names.md
View file

@ -75,7 +75,7 @@ compatibility is maintained between point releases (those with the same
major.minor number). major.minor number).
A known break in binary compatibility should be addressed by updating 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).
-------------------------------------------------------------------- --------------------------------------------------------------------

2
docs/contributing/about-version-numbers.md
View file

@ -16,7 +16,7 @@ instructions there.
Here is the list of files that need to be updated: Here is the list of files that need to be updated:
- build/bakefiles/version.bkl {C:R:A} [NOT UPDATED AUTOMATICALLY] - build/bakefiles/version.bkl {C:R:A} [NOT UPDATED AUTOMATICALLY]
- configure.in - configure.ac
- build/osx/wxvers.xcconfig - build/osx/wxvers.xcconfig
- docs/changes.txt - docs/changes.txt
- docs/readme.txt (date needs manual editing) [NOT UPDATED AUTOMATICALLY] - docs/readme.txt (date needs manual editing) [NOT UPDATED AUTOMATICALLY]

6
docs/contributing/how-to-add-files-to-build-system.md
View file

@ -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) 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: 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, * 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 * If wxFoo links against additional libraries, add necessary linker
flags and libraries to ldflags_foo and ldlibs_foo variables in flags and libraries to ldflags_foo and ldlibs_foo variables in
wx-config.in (both are optional). wx-config.in (both are optional).

8
docs/contributing/how-to-add-new-sample.md
View file

@ -36,15 +36,15 @@ samples/ with demos/ where needed).
compiler (run `bakefile --help` to get the list of possible values). compiler (run `bakefile --help` to get the list of possible values).
Again, see `how-to-add-files-to-build-system.md` for more information. 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 - 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 `SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS foo"` under it
- if it should be always built, locate the line `if test $wxUSE_GUI = yes` - 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) `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. by running "autoconf" on a Unix system in the corresponding directory.
5. Modify `build/cmake/samples/CMakeLists.txt` to include the sample in 5. Modify `build/cmake/samples/CMakeLists.txt` to include the sample in

2
docs/contributing/how-to-add-new-wxUSE_XXX.md
View file

@ -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 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. 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 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 block beginning after `WX_ARG_CACHE_INIT` line and should default to "no" for

2
docs/x11/install.md
View file

@ -393,7 +393,7 @@ automatically using wx-config
2. The other way creates a project within the source code 2. The other way creates a project within the source code
directories of wxWidgets. For this endeavour, you'll need directories of wxWidgets. For this endeavour, you'll need
GNU autoconf version 2.14 and add an entry to your Makefile.in 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. and configure before you can type make.
Further notes by Julian Smart {#x11_notes} Further notes by Julian Smart {#x11_notes}

2
misc/scripts/inc_release
View file

@ -25,7 +25,7 @@ msg "Updating version to $ver_string_new"
ver_for_sed="$ver_major\.$ver_minor\.$ver_release" 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/" \ "/^AC_INIT/s/$ver_for_sed/$ver_string_new/" \
"s/^wx_release_number=$ver_release/wx_release_number=$ver_release_new/" \ "s/^wx_release_number=$ver_release/wx_release_number=$ver_release_new/" \
"s/^wx_subrelease_number=.*$/wx_subrelease_number=0/" "s/^wx_subrelease_number=.*$/wx_subrelease_number=0/"

2
src/common/arttango.cpp
View file

@ -198,7 +198,7 @@ wxTangoArtProvider::CreateBitmapBundle(const wxArtID& id,
// Note: when adding elements here, try to also add the corresponding // Note: when adding elements here, try to also add the corresponding
// icon to src/gtk/artgtk.cpp as the GTK art provider is supposed // 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 #undef BITMAP_DATA

2
wxwin.m4
View file

@ -37,7 +37,7 @@ dnl ===========================================================================
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
dnl AC_ARG_ENABLE(...) dnl AC_ARG_ENABLE(...)
dnl AC_ARG_WITH(...) dnl AC_ARG_WITH(...)