diff options
| author | Mad Camel <madcamel@gmail.com> | 2025-05-28 19:32:08 +0000 |
|---|---|---|
| committer | Fedja Beader <fedja@protonmail.ch> | 2025-05-28 19:32:08 +0000 |
| commit | e81e12771ae0256f511567b81da36a1b66017fd9 (patch) | |
| tree | 68a5e9c257883d68f6526b331bafbd51c0c72534 | |
| parent | 1f9ca1a26b0595cba13d3d0b5ddcee55b4c92efa (diff) | |
| download | manaplus-e81e12771ae0256f511567b81da36a1b66017fd9.tar.gz manaplus-e81e12771ae0256f511567b81da36a1b66017fd9.tar.bz2 manaplus-e81e12771ae0256f511567b81da36a1b66017fd9.tar.xz manaplus-e81e12771ae0256f511567b81da36a1b66017fd9.zip | |
Updated configure.ac to newer autoconf standards by using the 'autoupdate' tool.
Fixes a lot of warnings when running autoreconf -i
----
_EDIT by @jesusalva on 2024-02-09: Marked as draft to prevent accidental merging_
Squashed with:
* Reduce autotools version requirement according to autoupdate test in gcc5 env
https://git.themanaworld.org/specing/manaplus/-/commits/autoupdate_test_in_gcc5job
As it turns out, AC_HEADER_TIME is unnecessary even in 2016 ubuntu
environment. It was unused: none of the time.h or sys/time.h includes
were protected by HAVE_TIME_H or TIME_WITH_SYS_TIME guards (they are
instead protected by WIN32 checks, in most but not all cases.
The same applies to the STDC_HEADERS macro: none of the includes were
protected by STDC_HEADERS, thus removing that is also not blocked by CI
upgrade.
****
mana/plus!25
Co-authored-by: Fedja Beader <fedja@protonmail.ch>
Approved-by: Jesusalva Jesusalva <jesusalva@tmw2.org>
| -rw-r--r--[-rwxr-xr-x] | configure.ac | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index 981cb3a64..b6adac16b 100755..100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ -AC_PREREQ(2.60) +AC_PREREQ([2.69]) AC_INIT([ManaPlus], [1.0], [], [manaplus], [https://manaverse.germantmw.de]) AM_INIT_AUTOMAKE([1.9]) -AC_LANG_CPLUSPLUS +AC_LANG([C++]) AC_DEFUN([AC_CHECK_CXX_FLAG], [ @@ -202,7 +202,7 @@ AM_PROG_CC_C_O AC_PROG_INSTALL # Checks for typedefs, structures, and compiler characteristics. -AC_HEADER_TIME + # Checks for library functions. AC_FUNC_ERROR_AT_LINE @@ -412,8 +412,7 @@ AC_MSG_ERROR([ *** CURL library found but cannot find headers (http://curl.haxx. # select xml lib AC_ARG_ENABLE(libxml, - AC_HELP_STRING([--enable-libxml=ARG], - [xml libs: libxml (default), pugixml (experimental)]), + AS_HELP_STRING([--enable-libxml=ARG],[xml libs: libxml (default), pugixml (experimental)]), [ xmllib="${enableval}" ], @@ -575,7 +574,6 @@ fi AM_CONDITIONAL(USE_X11, test "x$use_x11" = xyes) # Checks for header files. -AC_HEADER_STDC AC_CHECK_HEADERS([arpa/inet.h fcntl.h malloc.h netdb.h netinet/in.h stdlib.h string.h sys/socket.h unistd.h]) # Enable mac build |