summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruno Haible <bruno@clisp.org>2020-11-14 15:07:39 +0100
committerBruno Haible <bruno@clisp.org>2020-11-14 15:07:39 +0100
commiteee98aa8d72595fdb4308ed5d0583516bfc4c0d5 (patch)
treeb2f82771194439a6062c674079a4e234b4f72934
parentb34a7bcfbbad265c8ba69ec0a3112fe61f6b6d1e (diff)
downloadlibunistring-eee98aa8d72595fdb4308ed5d0583516bfc4c0d5.tar.gz
build: Fix warnings emitted by autoconf-2.69d.
* configure.ac: Use AC_CONFIG_HEADERS instead of AM_CONFIG_HEADER. * m4/exported.m4 (gt_GLOBAL_SYMBOL_PIPE): Require LT_PATH_NM instead of AC_PROG_NM. * m4/woe32-dll.m4 (gl_WOE32_DLL): Use AC_LINK_IFELSE instead of AC_TRY_LINK.
-rw-r--r--configure.ac2
-rw-r--r--m4/exported.m46
-rw-r--r--m4/woe32-dll.m44
3 files changed, 6 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac
index 3acecd9..7a5a1ca 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@ AC_CONFIG_AUX_DIR([build-aux])
. $srcdir/version.sh
gl_INIT_PACKAGE([libunistring], [$VERSION_NUMBER])
AM_INIT_AUTOMAKE([silent-rules dist-xz])
-AM_CONFIG_HEADER([config.h])
+AC_CONFIG_HEADERS([config.h])
dnl Override automake's tar command used for creating distributions.
am__tar='${AMTAR} chof - --owner=root --group=root "$$tardir"'
diff --git a/m4/exported.m4 b/m4/exported.m4
index be30ec9..2ee884f 100644
--- a/m4/exported.m4
+++ b/m4/exported.m4
@@ -1,5 +1,5 @@
-# exported.m4 serial 2 (gettext-0.21)
-dnl Copyright (C) 2006, 2009, 2019 Free Software Foundation, Inc.
+# exported.m4 serial 3 (gettext-0.21.1)
+dnl Copyright (C) 2006, 2009, 2019-2020 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
@@ -7,7 +7,7 @@ dnl with or without modifications, as long as this notice is preserved.
dnl Prerequisites of the exported.sh script:
dnl Check for nm output filter that yields the exported symbols.
AC_DEFUN([gt_GLOBAL_SYMBOL_PIPE], [
- AC_REQUIRE([AC_PROG_NM]) dnl provided by libtool.m4
+ AC_REQUIRE([LT_PATH_NM]) dnl provided by libtool.m4
AC_SUBST([NM])
AC_REQUIRE([_LT_CMD_GLOBAL_SYMBOLS]) dnl provided by libtool.m4
GLOBAL_SYMBOL_PIPE=$lt_cv_sys_global_symbol_pipe
diff --git a/m4/woe32-dll.m4 b/m4/woe32-dll.m4
index 0477246..8a14c2c 100644
--- a/m4/woe32-dll.m4
+++ b/m4/woe32-dll.m4
@@ -1,4 +1,4 @@
-# woe32-dll.m4 serial 5
+# woe32-dll.m4 serial 6
dnl Copyright (C) 2005-2006, 2011, 2018, 2020 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -46,7 +46,7 @@ AC_DEFUN([gl_WOE32_DLL],
[gl_cv_ld_autoimport=no],
[gl_save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS -Wl,--disable-auto-import"
- AC_TRY_LINK([], [], [gl_cv_ld_autoimport=yes], [gl_cv_ld_autoimport=no])
+ AC_LINK_IFELSE([], [gl_cv_ld_autoimport=yes], [gl_cv_ld_autoimport=no])
LDFLAGS="$gl_save_LDFLAGS"
])
])