Parcourir la source

* Checking for -lnsl is not needed

svn: 705
Bryan Drewery il y a 22 ans
Parent
commit
bbfa17f16e
3 fichiers modifiés avec 3 ajouts et 78 suppressions
  1. 1 1
      autotools/includes/acinclude.m4
  2. 0 3
      config.h.in
  3. 2 74
      configure

+ 1 - 1
autotools/includes/acinclude.m4

@@ -351,7 +351,7 @@ then
   AC_MSG_WARN(Skipping library tests because they CONFUSE Irix.)
 else
   AC_CHECK_LIB(socket, socket)
-  AC_CHECK_LIB(nsl, connect)
+#  AC_CHECK_LIB(nsl, connect)
   AC_CHECK_LIB(dns, gethostbyname)
   AC_CHECK_LIB(z, gzopen, ZLIB="-lz")
 #  AC_CHECK_LIB(ssl, SSL_accept, SSL="-lssl -lcrypto", SSL="", -lcrypto) 

+ 0 - 3
config.h.in

@@ -62,9 +62,6 @@
 /* Define to 1 if you have the `dns' library (-ldns). */
 #undef HAVE_LIBDNS
 
-/* Define to 1 if you have the `nsl' library (-lnsl). */
-#undef HAVE_LIBNSL
-
 /* Define to 1 if you have the `socket' library (-lsocket). */
 #undef HAVE_LIBSOCKET
 

+ 2 - 74
configure

@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac Revision: 1.17 .
+# From configure.ac Revision: 1.18 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.59.
 #
@@ -4971,79 +4971,7 @@ _ACEOF
 
 fi
 
-
-echo "$as_me:$LINENO: checking for connect in -lnsl" >&5
-echo $ECHO_N "checking for connect in -lnsl... $ECHO_C" >&6
-if test "${ac_cv_lib_nsl_connect+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lnsl  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char connect ();
-int
-main ()
-{
-connect ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_nsl_connect=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_nsl_connect=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_connect" >&5
-echo "${ECHO_T}$ac_cv_lib_nsl_connect" >&6
-if test $ac_cv_lib_nsl_connect = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBNSL 1
-_ACEOF
-
-  LIBS="-lnsl $LIBS"
-
-fi
-
+#  AC_CHECK_LIB(nsl, connect)
 
 echo "$as_me:$LINENO: checking for gethostbyname in -ldns" >&5
 echo $ECHO_N "checking for gethostbyname in -ldns... $ECHO_C" >&6