removed -lnsl and -lsocket checks from zend

diff --git a/Zend/acconfig.h b/Zend/acconfig.h
index bbb425aa646b3c0983b978a54ecc5aeed5c8edb0..b5a369dab8f8078644d201740a8869940bd03b8c 100644 (file)
--- a/Zend/acconfig.h
+++ b/Zend/acconfig.h
@@ -126,12 +126,6 @@
 /* Define if you have and want to use libcrypt */
 #define HAVE_LIBCRYPT 0
 
-/* Define if you have and want to use libnsl */
-#define HAVE_LIBNSL 0
-
-/* Define if you have and want to use libsocket */
-#define HAVE_LIBSOCKET 0
-
 /* Define if you have and want to use libpam */
 #define HAVE_LIBPAM 0
 

diff --git a/Zend/config.h.in b/Zend/config.h.in
index 9a8d7b7b89938809769651899594e04766807db5..1791ba610b7a8bca74921f70dabd1c7e5da52bde 100644 (file)
--- a/Zend/config.h.in
+++ b/Zend/config.h.in
@@ -46,18 +46,9 @@
 /* define ulong by configure if it is missed (most probably is) */
 #undef ulong
 
-/* Define if you have the resolv library (-lresolv). */
-#define HAVE_LIBRESOLV 0
-
 /* Define if you have libdl (used for dynamic linking) */
 #define HAVE_LIBDL 0
 
-/* Define if you have and want to use libnsl */
-#define HAVE_LIBNSL 0
-
-/* Define if you have and want to use libsocket */
-#define HAVE_LIBSOCKET 0
-
 #undef ZEND_DEBUG
 
 /* Define if you want to enable memory limit support */
@@ -269,6 +260,3 @@
 
 /* Define if you have the m library (-lm).  */
 #undef HAVE_LIBM
-
-/* Define if you have the resolv library (-lresolv).  */
-#undef HAVE_LIBRESOLV

diff --git a/Zend/configure.in b/Zend/configure.in
index 7a126467a50eeeb5290e2b6a298b6bc18e9d8230..ff5bad8c9f6537cff69bdd6438b7000790cb235c 100644 (file)
--- a/Zend/configure.in
+++ b/Zend/configure.in
@@ -70,11 +70,6 @@ if test -d /usr/pkg/include -a -d /usr/pkg/lib ; then
        LDFLAGS="$LDFLAGS -L/usr/pkg/lib"
 fi
 
-AC_CHECK_LIB(c, socket, [:], [
- AC_CHECK_LIB(socket, socket, [
-  LIBS="-lsocket $LIBS"
-  AC_DEFINE(HAVE_LIBSOCKET) ], []) ])
-
 AC_CHECK_LIB(c, dlopen, [
  # fake it
  AC_DEFINE(HAVE_LIBDL) ], [