summaryrefslogtreecommitdiff
path: root/m4
diff options
context:
space:
mode:
Diffstat (limited to 'm4')
-rw-r--r--m4/exported.m48
-rw-r--r--m4/init-package-version.m434
-rw-r--r--m4/libtool.m412
-rw-r--r--m4/woe32-dll.m432
4 files changed, 62 insertions, 24 deletions
diff --git a/m4/exported.m4 b/m4/exported.m4
index fc37923..2ee884f 100644
--- a/m4/exported.m4
+++ b/m4/exported.m4
@@ -1,5 +1,5 @@
-# exported.m4 serial 1 (gettext-0.18)
-dnl Copyright (C) 2006, 2009 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,9 +7,9 @@ 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([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE]) dnl provided by libtool.m4
+ AC_REQUIRE([_LT_CMD_GLOBAL_SYMBOLS]) dnl provided by libtool.m4
GLOBAL_SYMBOL_PIPE=$lt_cv_sys_global_symbol_pipe
AC_SUBST([GLOBAL_SYMBOL_PIPE])
if test -n "$GLOBAL_SYMBOL_PIPE"; then
diff --git a/m4/init-package-version.m4 b/m4/init-package-version.m4
index f131a84..823afc6 100644
--- a/m4/init-package-version.m4
+++ b/m4/init-package-version.m4
@@ -1,5 +1,5 @@
-# init-package-version.m4 serial 1 (gettext-0.18)
-dnl Copyright (C) 1992-2009 Free Software Foundation, Inc.
+# init-package-version.m4 serial 3
+dnl Copyright (C) 1992-2021 Free Software Foundation, Inc.
dnl This file is free software, distributed under the terms of the GNU
dnl General Public License. As a special exception to the GNU General
dnl Public License, this file may be distributed as part of a program
@@ -61,6 +61,28 @@ dnl the same distribution terms as the rest of that program.
# . $srcdir/../version.sh
# gl_INIT_PACKAGE(PACKAGE, $VERSION_NUMBER)
# AM_INIT_AUTOMAKE([OPTIONS])
+#
+# and after changing version.sh, the developer can directly configure and build:
+#
+# make distclean
+# ./configure
+# make
+#
+# Some other packages use another approach:
+#
+# AC_INIT(PACKAGE,
+# m4_normalize(m4_esyscmd([. ./version.sh; echo $VERSION_NUMBER])))
+# AC_CONFIG_SRCDIR(WITNESS)
+# AM_INIT_AUTOMAKE([OPTIONS])
+#
+# but here, after changing version.sh, the developer must first regenerate the
+# configure file:
+#
+# make distclean
+# ./autogen.sh --skip-gnulib
+# ./configure
+# make
+#
# gl_INIT_PACKAGE(PACKAGE-NAME, VERSION)
# --------------------------------------
@@ -77,7 +99,7 @@ AC_DEFUN([gl_INIT_PACKAGE],
m4_bpatsubst(m4_dquote(
m4_defn([AM_INIT_AUTOMAKE])),
[AC_PACKAGE_NAME], [gl_INIT_DUMMY])),
- [AC_PACKAGE_TARNAME], [gl_INIT_DUMMY])),
+ [AC_PACKAGE_TARNAME], [gl_INIT_EMPTY])),
[AC_PACKAGE_VERSION], [gl_INIT_DUMMY])
[AC_SUBST([PACKAGE], [$1])
AC_SUBST([VERSION], [$2])
@@ -85,7 +107,11 @@ AC_DEFUN([gl_INIT_PACKAGE],
m4_define([AM_INIT_AUTOMAKE],
m4_defn([gl_RPL_INIT_AUTOMAKE]))
])
-m4_define([gl_INIT_DUMMY], [])
+m4_define([gl_INIT_EMPTY], [])
+dnl Automake 1.16.4 no longer accepts an empty value for gl_INIT_DUMMY.
+dnl But a macro that later expands to empty works.
+m4_define([gl_INIT_DUMMY], [gl_INIT_DUMMY2])
+m4_define([gl_INIT_DUMMY2], [])
AC_DEFUN([gl_RPL_INIT_AUTOMAKE], [
m4_ifval([$2],
[m4_fatal([After gl_INIT_PACKAGE, the two-argument form of AM_INIT_AUTOMAKE cannot be used.])])
diff --git a/m4/libtool.m4 b/m4/libtool.m4
index d4e1427..3c2108f 100644
--- a/m4/libtool.m4
+++ b/m4/libtool.m4
@@ -1714,7 +1714,7 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
lt_cv_sys_max_cmd_len=8192;
;;
- bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*)
+ bitrig* | darwin* | dragonfly* | freebsd* | midnightbsd* | netbsd* | openbsd*)
# This has been around since 386BSD, at least. Likely further.
if test -x /sbin/sysctl; then
lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
@@ -2655,7 +2655,7 @@ dgux*)
shlibpath_var=LD_LIBRARY_PATH
;;
-freebsd* | dragonfly*)
+freebsd* | dragonfly* | midnightbsd*)
# DragonFly does not have aout. When/if they implement a new
# versioning mechanism, adjust this.
if test -x /usr/bin/objformat; then
@@ -3488,7 +3488,7 @@ darwin* | rhapsody*)
lt_cv_deplibs_check_method=pass_all
;;
-freebsd* | dragonfly*)
+freebsd* | dragonfly* | midnightbsd*)
if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
case $host_cpu in
i*86 )
@@ -4320,7 +4320,7 @@ m4_if([$1], [CXX], [
;;
esac
;;
- freebsd* | dragonfly*)
+ freebsd* | dragonfly* | midnightbsd*)
# FreeBSD uses GNU C++
;;
hpux9* | hpux10* | hpux11*)
@@ -5653,7 +5653,7 @@ _LT_EOF
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
- freebsd* | dragonfly*)
+ freebsd* | dragonfly* | midnightbsd*)
_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
_LT_TAGVAR(hardcode_direct, $1)=yes
@@ -6763,7 +6763,7 @@ if test yes != "$_lt_caught_CXX_error"; then
_LT_TAGVAR(archive_cmds_need_lc, $1)=no
;;
- freebsd* | dragonfly*)
+ freebsd* | dragonfly* | midnightbsd*)
# FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
# conventions
_LT_TAGVAR(ld_shlibs, $1)=yes
diff --git a/m4/woe32-dll.m4 b/m4/woe32-dll.m4
index a25f5ac..8a14c2c 100644
--- a/m4/woe32-dll.m4
+++ b/m4/woe32-dll.m4
@@ -1,5 +1,5 @@
-# woe32-dll.m4 serial 3
-dnl Copyright (C) 2005-2006, 2011, 2015-2016 Free Software Foundation, Inc.
+# 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,
dnl with or without modifications, as long as this notice is preserved.
@@ -25,19 +25,31 @@ dnl From Bruno Haible.
# exported struct variable, or to a particular element of an exported
# array variable), requiring code modifications. One platform
# dictates code modifications on all platforms.
-# See <http://www.haible.de/bruno/woe32dll.html> for more details.
+# See <https://haible.de/bruno/woe32dll.html> for more details.
AC_DEFUN([gl_WOE32_DLL],
[
AC_REQUIRE([AC_CANONICAL_HOST])
case "$host_os" in
mingw* | cygwin*)
- AC_MSG_CHECKING([for auto-import of symbols])
- AC_CACHE_VAL([gl_cv_ld_autoimport], [
- gl_save_LDFLAGS="$LDFLAGS"
- LDFLAGS="$LDFLAGS -Wl,--disable-auto-import"
- AC_TRY_LINK([], [], [gl_cv_ld_autoimport=yes], [gl_cv_ld_autoimport=no])
- LDFLAGS="$gl_save_LDFLAGS"])
- AC_MSG_RESULT([$gl_cv_ld_autoimport])
+ AC_CACHE_CHECK([for auto-import of symbols],
+ [gl_cv_ld_autoimport],
+ [dnl --disable-auto-import is unsupported in MSVC and in MSVC/clang.
+ dnl We need to sort out this case explicitly, because with clang,
+ dnl -Wl,--disable-auto-import does not yield an error, however later
+ dnl libtool turns it into --disable-auto-import, which does produce
+ dnl an error.
+ AC_EGREP_CPP([Known], [
+ #ifdef _MSC_VER
+ Known
+ #endif
+ ],
+ [gl_cv_ld_autoimport=no],
+ [gl_save_LDFLAGS="$LDFLAGS"
+ LDFLAGS="$LDFLAGS -Wl,--disable-auto-import"
+ AC_LINK_IFELSE([], [gl_cv_ld_autoimport=yes], [gl_cv_ld_autoimport=no])
+ LDFLAGS="$gl_save_LDFLAGS"
+ ])
+ ])
if test $gl_cv_ld_autoimport = yes; then
LDFLAGS="$LDFLAGS -Wl,--disable-auto-import"
fi
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 01:26:00 +0000