diff options
| author | Bruno Haible <bruno@clisp.org> | 2009-04-26 16:11:51 +0000 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2009-06-23 12:16:04 +0200 |
| commit | f10f42c2f95f63332e1f84c85bc7fc821af51c78 (patch) | |
| tree | d7d7b0c0c8a882b6a488e8b3406a4e2c3292f7cc | |
| parent | d6690cc7b396ea5e9e9b4f50749d89ad5860d84c (diff) | |
| download | external_gettext-f10f42c2f95f63332e1f84c85bc7fc821af51c78.zip external_gettext-f10f42c2f95f63332e1f84c85bc7fc821af51c78.tar.gz external_gettext-f10f42c2f95f63332e1f84c85bc7fc821af51c78.tar.bz2 | |
Add a fifth argument to AC_LIB_HAVE_LINKFLAGS. From gnulib.
| -rw-r--r-- | autoconf-lib-link/m4/ChangeLog | 4 | ||||
| -rw-r--r-- | autoconf-lib-link/m4/lib-link.m4 | 17 |
2 files changed, 14 insertions, 7 deletions
diff --git a/autoconf-lib-link/m4/ChangeLog b/autoconf-lib-link/m4/ChangeLog index 5534b6b..5575c76 100644 --- a/autoconf-lib-link/m4/ChangeLog +++ b/autoconf-lib-link/m4/ChangeLog @@ -1,3 +1,7 @@ +2009-04-26 Bruno Haible <bruno@clisp.org> + + * lib-link.m4 (AC_LIB_HAVE_LINKFLAGS): Accept a fifth argument. + 2009-01-14 Jim Meyering <meyering@redhat.com> * lib-link.m4: More consistent m4 quoting. diff --git a/autoconf-lib-link/m4/lib-link.m4 b/autoconf-lib-link/m4/lib-link.m4 index fcd3391..2144203 100644 --- a/autoconf-lib-link/m4/lib-link.m4 +++ b/autoconf-lib-link/m4/lib-link.m4 @@ -1,4 +1,4 @@ -# lib-link.m4 serial 18 (gettext-0.18) +# lib-link.m4 serial 19 (gettext-0.18) dnl Copyright (C) 2001-2009 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -43,12 +43,13 @@ AC_DEFUN([AC_LIB_LINKFLAGS], popdef([Name]) ]) -dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode) +dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode, [missing-message]) dnl searches for libname and the libraries corresponding to explicit and dnl implicit dependencies, together with the specified include files and -dnl the ability to compile and link the specified testcode. If found, it -dnl sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME} and -dnl LTLIB${NAME} variables and augments the CPPFLAGS variable, and +dnl the ability to compile and link the specified testcode. The missing-message +dnl defaults to 'no' and may contain additional hints for the user. +dnl If found, it sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME} +dnl and LTLIB${NAME} variables and augments the CPPFLAGS variable, and dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty. dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname @@ -74,12 +75,14 @@ AC_DEFUN([AC_LIB_HAVE_LINKFLAGS], AC_CACHE_CHECK([for lib[]$1], [ac_cv_lib[]Name], [ ac_save_LIBS="$LIBS" LIBS="$LIBS $LIB[]NAME" - AC_TRY_LINK([$3], [$4], [ac_cv_lib[]Name=yes], [ac_cv_lib[]Name=no]) + AC_TRY_LINK([$3], [$4], + [ac_cv_lib[]Name=yes], + [ac_cv_lib[]Name='m4_if([$5], [], [no], [[$5]])']) LIBS="$ac_save_LIBS" ]) if test "$ac_cv_lib[]Name" = yes; then HAVE_LIB[]NAME=yes - AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the $1 library.]) + AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the lib[]$1 library.]) AC_MSG_CHECKING([how to link with lib[]$1]) AC_MSG_RESULT([$LIB[]NAME]) else |