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