Don't include getndelim2.o twice into LIBOBJS.

[gnulib.git] / m4 / search-libs.m4

diff --git a/m4/search-libs.m4 b/m4/search-libs.m4
index 6979ea8..41c1c04 100644 (file)
--- a/m4/search-libs.m4
+++ b/m4/search-libs.m4
@@ -1,42 +1,40 @@
-#serial 1
+#serial 5

 
 dnl A replacement for autoconf's macro by the same name.  This version
 dnl uses `ac_lib' rather than `i' for the loop variable, but more importantly
 
 dnl A replacement for autoconf's macro by the same name.  This version
 dnl uses `ac_lib' rather than `i' for the loop variable, but more importantly

-dnl moves the ACTION-IF-FOUND ($3) into the inner `if'-block so that it is
+dnl moves the ACTION-IF-FOUND ([$]3) into the inner `if'-block so that it is

 dnl run only if one of the listed libraries ends up being used (and not in
 dnl the `none required' case.
 dnl I hope it's only temporary while we wait for that version to be fixed.
 dnl run only if one of the listed libraries ends up being used (and not in
 dnl the `none required' case.
 dnl I hope it's only temporary while we wait for that version to be fixed.

-undefine(AC_SEARCH_LIBS)
+undefine([AC_SEARCH_LIBS])

 
 

-dnl AC_SEARCH_LIBS(FUNCTION, SEARCH-LIBS [, ACTION-IF-FOUND
-dnl            [, ACTION-IF-NOT-FOUND [, OTHER-LIBRARIES]]])
-dnl Search for a library defining FUNC, if it's not already available.
-
-AC_DEFUN(AC_SEARCH_LIBS,
+# AC_SEARCH_LIBS(FUNCTION, SEARCH-LIBS,
+#                [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND],
+#                [OTHER-LIBRARIES])
+# --------------------------------------------------------
+# Search for a library defining FUNC, if it's not already available.
+AC_DEFUN([AC_SEARCH_LIBS],

 [
 [

-  AC_PREREQ([2.13])

   AC_CACHE_CHECK([for library containing $1], [ac_cv_search_$1],
   [
   AC_CACHE_CHECK([for library containing $1], [ac_cv_search_$1],
   [

-    ac_func_search_save_LIBS="$LIBS"
-    ac_cv_search_$1="no"
-    AC_TRY_LINK_FUNC([$1], [ac_cv_search_$1="none required"])
-    if test "$ac_cv_search_$1" = "no"; then
+    ac_func_search_save_LIBS=$LIBS
+    ac_cv_search_$1=no
+    AC_TRY_LINK_FUNC([$1], [ac_cv_search_$1='none required'])
+    if test "$ac_cv_search_$1" = no; then

       for ac_lib in $2; do
        LIBS="-l$ac_lib $5 $ac_func_search_save_LIBS"
       for ac_lib in $2; do
        LIBS="-l$ac_lib $5 $ac_func_search_save_LIBS"

-       AC_TRY_LINK_FUNC([$1],
-         [ac_cv_search_$1="-l$ac_lib"
-         break])
+       AC_TRY_LINK_FUNC([$1], [ac_cv_search_$1="-l$ac_lib"; break])

       done
     fi
       done
     fi

-    LIBS="$ac_func_search_save_LIBS"
+    LIBS=$ac_func_search_save_LIBS

   ])
 
   ])
 

-  if test "$ac_cv_search_$1" = "no"; then
+  if test "$ac_cv_search_$1" = no; then :

     $4
   else
     $4
   else

-    if test "$ac_cv_search_$1" = "none required"; then
+    if test "$ac_cv_search_$1" = 'none required'; then :

       $4
       $4

-    else :
+    else

       LIBS="$ac_cv_search_$1 $LIBS"
       $3
     fi
       LIBS="$ac_cv_search_$1 $LIBS"
       $3
     fi