1From f492b19f59229b0494b5b9ffe5c660a35493a405 Mon Sep 17 00:00:00 2001 2From: =?UTF-8?q?Christian=20G=C3=B6ttsche?= <cgzones@googlemail.com> 3Date: Mon, 29 Jun 2020 18:58:09 +0200 4Subject: [PATCH] configure: replace deprecated macros 5 6* use LT_INIT instead of deprecated AC_PROG_LIBTOOL 7* use AS_HELP_STRING instead of deprecated AC_HELP_STRING 8* quote macros 9 10[Retrieved from: 11https://github.com/rpm-software-management/popt/commit/f492b19f59229b0494b5b9ffe5c660a35493a405] 12Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> 13--- 14 configure.ac | 20 ++++++++++---------- 15 1 file changed, 10 insertions(+), 10 deletions(-) 16 mode change 100755 => 100644 configure.ac 17 18diff --git a/configure.ac b/configure.ac 19old mode 100755 20new mode 100644 21index 3b71d1a..009ae7b 22--- a/configure.ac 23+++ b/configure.ac 24@@ -1,5 +1,5 @@ 25-AC_PREREQ(2.57) 26-AC_INIT(popt, 1.18, rpm-maint@lists.rpm.org) 27+AC_PREREQ([2.57]) 28+AC_INIT([popt], [1.18], [rpm-maint@lists.rpm.org]) 29 AC_CONFIG_SRCDIR([src/popt.h]) 30 AC_CONFIG_HEADERS([config.h]) 31 32@@ -14,11 +14,11 @@ AC_USE_SYSTEM_EXTENSIONS 33 AM_PROG_AR 34 35 AC_PROG_INSTALL 36-AC_PROG_LIBTOOL 37+LT_INIT 38 39 AC_SYS_LARGEFILE 40 41-AC_CHECK_HEADERS(fnmatch.h glob.h langinfo.h libintl.h mcheck.h stdalign.h) 42+AC_CHECK_HEADERS([fnmatch.h glob.h langinfo.h libintl.h mcheck.h stdalign.h]) 43 44 # For some systems we know that we have ld_version scripts. 45 # Use it then as default. 46@@ -32,15 +32,15 @@ case "${host}" in 47 ;; 48 esac 49 AC_ARG_ENABLE([ld-version-script], 50- AC_HELP_STRING([--enable-ld-version-script], 51+ [AS_HELP_STRING([--enable-ld-version-script], 52 [enable/disable use of linker version script. 53- (default is system dependent)]), 54+ (default is system dependent)])], 55 [have_ld_version_script=$enableval], 56 [ : ] ) 57 AM_CONDITIONAL(HAVE_LD_VERSION_SCRIPT, test "$have_ld_version_script" = "yes") 58 59-AC_ARG_ENABLE(build-gcov, 60- AS_HELP_STRING([--enable-build-gcov], [build POPT instrumented for gcov]), [dnl 61+AC_ARG_ENABLE([build-gcov], 62+ [AS_HELP_STRING([--enable-build-gcov], [build POPT instrumented for gcov])], [dnl 63 if test ".$enableval" = .yes; then 64 if test ".`$CC --version 2>&1 | grep 'GCC'`" != .; then 65 dnl # GNU GCC (usually "gcc") 66@@ -49,8 +49,8 @@ AC_ARG_ENABLE(build-gcov, 67 fi 68 ]) 69 70-AC_SEARCH_LIBS(setreuid, [ucb]) 71-AC_CHECK_FUNCS(getuid geteuid iconv mtrace secure_getenv __secure_getenv setreuid setuid stpcpy strerror vasprintf srandom glob_pattern_p) 72+AC_SEARCH_LIBS([setreuid], [ucb]) 73+AC_CHECK_FUNCS([getuid geteuid iconv mtrace secure_getenv __secure_getenv setreuid setuid stpcpy strerror vasprintf srandom glob_pattern_p]) 74 75 AM_GNU_GETTEXT_VERSION([0.18.2]) 76 AM_GNU_GETTEXT([external]) 77