summaryrefslogtreecommitdiff
path: root/gl/m4/lib-link.m4
diff options
context:
space:
mode:
authorSimon Josefsson <simon@josefsson.org>2010-04-13 20:18:44 +0200
committerSimon Josefsson <simon@josefsson.org>2010-04-13 20:24:59 +0200
commit30748a9bcbfb76460e42ec96b6988ffc69267680 (patch)
tree95459aa136a9213f4cea7b42fa50dcaffb827723 /gl/m4/lib-link.m4
parentd0d9fa436ed1dce70395d477f9b15199b0482bb6 (diff)
downloadgnutls-30748a9bcbfb76460e42ec96b6988ffc69267680.tar.gz
Update gnulib files, fix syntax-check warnings.
Diffstat (limited to 'gl/m4/lib-link.m4')
-rw-r--r--gl/m4/lib-link.m414
1 files changed, 12 insertions, 2 deletions
diff --git a/gl/m4/lib-link.m4 b/gl/m4/lib-link.m4
index 90e1ac9170..c73bd8e3a4 100644
--- a/gl/m4/lib-link.m4
+++ b/gl/m4/lib-link.m4
@@ -1,4 +1,4 @@
-# lib-link.m4 serial 20 (gettext-0.18)
+# lib-link.m4 serial 21 (gettext-0.18)
dnl Copyright (C) 2001-2010 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -74,7 +74,17 @@ AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
AC_CACHE_CHECK([for lib[]$1], [ac_cv_lib[]Name], [
ac_save_LIBS="$LIBS"
- LIBS="$LIBS $LIB[]NAME"
+ dnl If $LIB[]NAME contains some -l options, add it to the end of LIBS,
+ dnl because these -l options might require -L options that are present in
+ dnl LIBS. -l options benefit only from the -L options listed before it.
+ dnl Otherwise, add it to the front of LIBS, because it may be a static
+ dnl library that depends on another static library that is present in LIBS.
+ dnl Static libraries benefit only from the static libraries listed after
+ dnl it.
+ case " $LIB[]NAME" in
+ *" -l"*) LIBS="$LIBS $LIB[]NAME" ;;
+ *) LIBS="$LIB[]NAME $LIBS" ;;
+ esac
AC_TRY_LINK([$3], [$4],
[ac_cv_lib[]Name=yes],
[ac_cv_lib[]Name='m4_if([$5], [], [no], [[$5]])'])