autoconf: run autoupdate

configure.ac

@@ -11,8 +11,8 @@ dnl This software is provided 'as is' and without any warranty, express or
 dnl implied.  In no event shall the authors be liable for any damages arising
 dnl from the use of this software.
 
-AC_PREREQ([2.68])
-AC_INIT([pkgconf], [1.8.0], [https://github.com/pkgconf/pkgconf/issues/new])
+AC_PREREQ([2.71])
+AC_INIT([pkgconf],[1.8.0],[https://github.com/pkgconf/pkgconf/issues/new])
 AC_CONFIG_SRCDIR([cli/main.c])
 AC_CONFIG_MACRO_DIR([m4])
 AX_CHECK_COMPILE_FLAG([-Wall], [CFLAGS="$CFLAGS -Wall"])
@@ -30,26 +30,26 @@ LT_INIT
 
 AC_SYS_LARGEFILE
 
-AC_ARG_WITH([personality-dir],[AC_HELP_STRING([--with-personality-dir],[specify
+AC_ARG_WITH([personality-dir],[AS_HELP_STRING([--with-personality-dir],[specify
 	     the place where cross-compile personality files will be found])],
 	     PERSONALITY_PATH="$withval",
 	     PERSONALITY_PATH="${datadir}/pkgconfig/personality.d:${sysconfdir}/pkgconfig/personality.d")
 
 AC_SUBST([PERSONALITY_PATH])
 
-AC_ARG_WITH([pkg-config-dir],[AC_HELP_STRING([--with-pkg-config-dir],[specify
+AC_ARG_WITH([pkg-config-dir],[AS_HELP_STRING([--with-pkg-config-dir],[specify
 	     the place where pc files will be found])],PKG_DEFAULT_PATH="$withval",
 	     PKG_DEFAULT_PATH="${libdir}/pkgconfig:${datadir}/pkgconfig")
 
 AC_SUBST([PKG_DEFAULT_PATH])
 
-AC_ARG_WITH([system-libdir],[AC_HELP_STRING([--with-system-libdir],[specify the
+AC_ARG_WITH([system-libdir],[AS_HELP_STRING([--with-system-libdir],[specify the
 	     system library directory (default LIBDIR)])],
 	     SYSTEM_LIBDIR="$withval", SYSTEM_LIBDIR="${libdir}")
 
 AC_SUBST([SYSTEM_LIBDIR])
 
-AC_ARG_WITH([system-includedir],[AC_HELP_STRING([--with-system-includedir],[specify the
+AC_ARG_WITH([system-includedir],[AS_HELP_STRING([--with-system-includedir],[specify the
 	     system include directory (default INCLUDEDIR)])],
 	     SYSTEM_INCLUDEDIR="$withval", SYSTEM_INCLUDEDIR="${includedir}")
 

tests/requires.sh

@@ -69,7 +69,7 @@ private_duplication_body()
 {
 	export PKG_CONFIG_PATH="${selfdir}/lib1"
 	atf_check \
-		-o inline:"-lprivate -lfoo -lbaz -lzee -lbar -lfoo \n" \
+		-o inline:"-lprivate -lfoo -lbaz -lzee -lfoo -lbar \n" \
 		pkgconf --static --libs-only-l private-libs-duplication
 }