Updated

[chaz/tar] / configure.ac

diff --git a/configure.ac b/configure.ac
index b0c4431121900d489245c55a58217a5f5c7d49ac..d7ea405d7024258153640289e8070076b482ccbe 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -152,13 +152,15 @@ jm_XSTRTOUMAX
 # Solaris 7 prefers the library name -lrt to the obsolescent name -lposix4.
 tar_save_LIBS=$LIBS
   LIB_CLOCK_GETTIME=
-  AC_SEARCH_LIBS(clock_gettime, [rt posix4],
-                [LIB_CLOCK_GETTIME=$ac_cv_search_clock_gettime])
+  AC_SEARCH_LIBS(clock_gettime, [rt posix4])
+  case "$ac_cv_search_clock_gettime" in
+    -l*) LIB_CLOCK_GETTIME=$ac_cv_search_clock_gettime;;
+  esac
   AC_SUBST(LIB_CLOCK_GETTIME)
   AC_CHECK_FUNCS(clock_gettime)
 LIBS=$tar_save_LIBS
 
-AC_CHECK_FUNCS(fsync lstat mkfifo readlink strerror symlink)
+AC_CHECK_FUNCS(fsync lstat mkfifo readlink strerror symlink setlocale)
 AC_CHECK_DECLS([getgrgid],,, [#include <grp.h>])
 AC_CHECK_DECLS([getpwuid],,, [#include <pwd.h>])
 AC_CHECK_DECLS([valloc])
@@ -169,9 +171,10 @@ tar_save_LIBS=$LIBS
   AC_SEARCH_LIBS(setsockopt, [socket], ,
     [AC_SEARCH_LIBS(setsockopt, [socket], , , [-lnsl])])
   AC_SEARCH_LIBS(setsockopt, [nsl])
-  if test " $LIBS" != " $tar_save_LIBS"; then
-    LIB_SETSOCKOPT=$ac_cv_search_setsockopt
-  fi
+
+  case "$ac_cv_search_setsockopt" in
+    -l*) LIB_SETSOCKOPT=$ac_cv_search_setsockopt
+  esac
   AC_SUBST(LIB_SETSOCKOPT)
 LIBS=$tar_save_LIBS