From: Jozsef Kadlecsik Date: Tue, 21 May 2024 12:27:13 +0000 (+0200) Subject: Update autoconfig tools to build cleanly on Debian bookworm X-Git-Tag: v7.22~8 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=618d2d66657eef7e33a474046dfafeb2ede866b3;p=thirdparty%2Fipset.git Update autoconfig tools to build cleanly on Debian bookworm --- diff --git a/configure.ac b/configure.ac index db9e3f82..1e449457 100644 --- a/configure.ac +++ b/configure.ac @@ -1,9 +1,9 @@ dnl Boilerplate -AC_INIT([ipset], [7.21], [kadlec@netfilter.org]) +AC_INIT([ipset],[7.21],[kadlec@netfilter.org]) AC_CONFIG_AUX_DIR([build-aux]) AC_CANONICAL_HOST AC_CONFIG_MACRO_DIR([m4]) -AC_CONFIG_HEADER([config.h]) +AC_CONFIG_HEADERS([config.h]) AM_INIT_AUTOMAKE([foreign subdir-objects tar-pax no-dist-gzip dist-xz]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) @@ -182,7 +182,7 @@ dnl Checks for programs AC_PROG_CC AM_PROG_CC_C_O -AC_PROG_LIBTOOL +LT_INIT AC_PROG_INSTALL AC_PROG_LN_S diff --git a/m4/ax_cflags_gcc_option.m4 b/m4/ax_cflags_gcc_option.m4 index 8cffe5d8..b173ed4f 100644 --- a/m4/ax_cflags_gcc_option.m4 +++ b/m4/ax_cflags_gcc_option.m4 @@ -80,15 +80,14 @@ AS_VAR_PUSHDEF([VAR],[ax_cv_cflags_gcc_option_$2])dnl AC_CACHE_CHECK([m4_ifval($1,$1,FLAGS) for gcc m4_ifval($2,$2,-option)], VAR,[AS_VAR_SET([VAR],["no, unknown"]) AC_LANG_SAVE - AC_LANG_C + AC_LANG([C]) ac_save_[]FLAGS="$[]FLAGS" for ac_arg dnl in "-pedantic -Werror % m4_ifval($2,$2,-option)" dnl GCC "-pedantic % m4_ifval($2,$2,-option) %% no, obsolete" dnl new GCC # do FLAGS="$ac_save_[]FLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'` - AC_TRY_COMPILE([],[return 0;], - [AS_VAR_SET([VAR],[`echo $ac_arg | sed -e 's,.*% *,,'`]); break]) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[return 0;]])],[AS_VAR_SET([VAR],[`echo $ac_arg | sed -e 's,.*% *,,'`]); break],[]) done FLAGS="$ac_save_[]FLAGS" AC_LANG_RESTORE @@ -117,15 +116,14 @@ AS_VAR_PUSHDEF([VAR],[ax_cv_cxxflags_gcc_option_$2])dnl AC_CACHE_CHECK([m4_ifval($1,$1,FLAGS) for gcc m4_ifval($2,$2,-option)], VAR,[AS_VAR_SET([VAR],["no, unknown"]) AC_LANG_SAVE - AC_LANG_CPLUSPLUS + AC_LANG([C++]) ac_save_[]FLAGS="$[]FLAGS" for ac_arg dnl in "-pedantic -Werror % m4_ifval($2,$2,-option)" dnl GCC "-pedantic % m4_ifval($2,$2,-option) %% no, obsolete" dnl new GCC # do FLAGS="$ac_save_[]FLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'` - AC_TRY_COMPILE([],[return 0;], - [AS_VAR_SET([VAR],[`echo $ac_arg | sed -e 's,.*% *,,'`]); break]) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[return 0;]])],[AS_VAR_SET([VAR],[`echo $ac_arg | sed -e 's,.*% *,,'`]); break],[]) done FLAGS="$ac_save_[]FLAGS" AC_LANG_RESTORE @@ -153,15 +151,14 @@ AS_VAR_PUSHDEF([VAR],[ax_cv_cflags_gcc_option_$1])dnl AC_CACHE_CHECK([m4_ifval($2,$2,FLAGS) for gcc m4_ifval($1,$1,-option)], VAR,[AS_VAR_SET([VAR],["no, unknown"]) AC_LANG_SAVE - AC_LANG_C + AC_LANG([C]) ac_save_[]FLAGS="$[]FLAGS" for ac_arg dnl in "-pedantic -Werror % m4_ifval($1,$1,-option)" dnl GCC "-pedantic % m4_ifval($1,$1,-option) %% no, obsolete" dnl new GCC # do FLAGS="$ac_save_[]FLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'` - AC_TRY_COMPILE([],[return 0;], - [AS_VAR_SET([VAR],[`echo $ac_arg | sed -e 's,.*% *,,'`]); break]) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[return 0;]])],[AS_VAR_SET([VAR],[`echo $ac_arg | sed -e 's,.*% *,,'`]); break],[]) done FLAGS="$ac_save_[]FLAGS" AC_LANG_RESTORE @@ -190,15 +187,14 @@ AS_VAR_PUSHDEF([VAR],[ax_cv_cxxflags_gcc_option_$1])dnl AC_CACHE_CHECK([m4_ifval($2,$2,FLAGS) for gcc m4_ifval($1,$1,-option)], VAR,[AS_VAR_SET([VAR],["no, unknown"]) AC_LANG_SAVE - AC_LANG_CPLUSPLUS + AC_LANG([C++]) ac_save_[]FLAGS="$[]FLAGS" for ac_arg dnl in "-pedantic -Werror % m4_ifval($1,$1,-option)" dnl GCC "-pedantic % m4_ifval($1,$1,-option) %% no, obsolete" dnl new GCC # do FLAGS="$ac_save_[]FLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'` - AC_TRY_COMPILE([],[return 0;], - [AS_VAR_SET([VAR],[`echo $ac_arg | sed -e 's,.*% *,,'`]); break]) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[return 0;]])],[AS_VAR_SET([VAR],[`echo $ac_arg | sed -e 's,.*% *,,'`]); break],[]) done FLAGS="$ac_save_[]FLAGS" AC_LANG_RESTORE