summaryrefslogtreecommitdiff
path: root/m4/lib-link.m4
diff options
context:
space:
mode:
authorMarcus Brinkmann <mb@g10code.com>2006-03-14 12:44:14 +0000
committerMarcus Brinkmann <mb@g10code.com>2006-03-14 12:44:14 +0000
commite0006200c25df69965af5aea7e1a11fe67c70db7 (patch)
tree6d3444ef20371e9fbfa03f85bb58746b1d32b2ae /m4/lib-link.m4
parent35bc4ecfb5536c9fc8a7ffe7864d5fbf1ee2efd9 (diff)
downloadlibgpg-error-e0006200c25df69965af5aea7e1a11fe67c70db7.tar.gz
2006-03-14 Marcus Brinkmann <marcus@g10code.de>
Many files regenerated. * src/Makefile.am (gpg_error_CPPFLAGS, libgpg_error_la_CPPFLAGS): Add -I../intl. * Makefile.am (SUBDIRS): Add intl. * configure.ac (AC_CONFIG_FILES): Add intl/Makefile. (AM_GNU_GETTEXT_VERSION): Bump to 0.14.5. intl/ 2005-05-23 GNU <bug-gnu-gettext@gnu.org> * Version 0.14.5 released. m4/ 2006-03-14 gettextize <bug-gnu-gettext@gnu.org> * codeset.m4: Upgrade to gettext-0.14.5. * gettext.m4: Upgrade to gettext-0.14.5. * glibc2.m4: New file, from gettext-0.14.5. * glibc21.m4: Upgrade to gettext-0.14.5. * iconv.m4: Upgrade to gettext-0.14.5. * intdiv0.m4: Upgrade to gettext-0.14.5. * intmax.m4: New file, from gettext-0.14.5. * inttypes.m4: Upgrade to gettext-0.14.5. * inttypes_h.m4: Upgrade to gettext-0.14.5. * inttypes-pri.m4: Upgrade to gettext-0.14.5. * isc-posix.m4: Upgrade to gettext-0.14.5. * lcmessage.m4: Upgrade to gettext-0.14.5. * lib-ld.m4: Upgrade to gettext-0.14.5. * lib-link.m4: Upgrade to gettext-0.14.5. * lib-prefix.m4: Upgrade to gettext-0.14.5. * longdouble.m4: New file, from gettext-0.14.5. * longlong.m4: New file, from gettext-0.14.5. * nls.m4: Upgrade to gettext-0.14.5. * po.m4: Upgrade to gettext-0.14.5. * printf-posix.m4: New file, from gettext-0.14.5. * progtest.m4: Upgrade to gettext-0.14.5. * signed.m4: New file, from gettext-0.14.5. * size_max.m4: New file, from gettext-0.14.5. * stdint_h.m4: Upgrade to gettext-0.14.5. * uintmax_t.m4: Upgrade to gettext-0.14.5. * ulonglong.m4: Upgrade to gettext-0.14.5. * wchar_t.m4: New file, from gettext-0.14.5. * wint_t.m4: New file, from gettext-0.14.5. * xsize.m4: New file, from gettext-0.14.5. * Makefile.am (EXTRA_DIST): Add the new files. po/ 2006-03-14 gettextize <bug-gnu-gettext@gnu.org> * Makefile.in.in: Upgrade to gettext-0.14.5. * Rules-quot: Upgrade to gettext-0.14.5.
Diffstat (limited to 'm4/lib-link.m4')
-rw-r--r--m4/lib-link.m420
1 files changed, 11 insertions, 9 deletions
diff --git a/m4/lib-link.m4 b/m4/lib-link.m4
index eeb200d..ea0b0c4 100644
--- a/m4/lib-link.m4
+++ b/m4/lib-link.m4
@@ -1,13 +1,13 @@
-# lib-link.m4 serial 4 (gettext-0.12)
-dnl Copyright (C) 2001-2003 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
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+# lib-link.m4 serial 6 (gettext-0.14.3)
+dnl Copyright (C) 2001-2005 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.
dnl From Bruno Haible.
+AC_PREREQ(2.50)
+
dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and
dnl the libraries corresponding to explicit and implicit dependencies.
dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and
@@ -95,6 +95,8 @@ dnl libext, shlibext, hardcode_libdir_flag_spec, hardcode_libdir_separator,
dnl hardcode_direct, hardcode_minus_L.
AC_DEFUN([AC_LIB_RPATH],
[
+ dnl Tell automake >= 1.10 to complain if config.rpath is missing.
+ m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([config.rpath])])
AC_REQUIRE([AC_PROG_CC]) dnl we use $CC, $GCC, $LDFLAGS
AC_REQUIRE([AC_LIB_PROG_LD]) dnl we use $LD, $with_gnu_ld
AC_REQUIRE([AC_CANONICAL_HOST]) dnl we use $host
@@ -350,7 +352,7 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
if test "X$additional_includedir" = "X/usr/local/include"; then
if test -n "$GCC"; then
case $host_os in
- linux*) haveit=yes;;
+ linux* | gnu* | k*bsd*-gnu) haveit=yes;;
esac
fi
fi
@@ -399,7 +401,7 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
if test "X$additional_libdir" = "X/usr/local/lib"; then
if test -n "$GCC"; then
case $host_os in
- linux*) haveit=yes;;
+ linux* | gnu* | k*bsd*-gnu) haveit=yes;;
esac
fi
fi