summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSascha Schumann <sas@php.net>1999-12-04 13:16:04 +0000
committerSascha Schumann <sas@php.net>1999-12-04 13:16:04 +0000
commitb978a64ebb4f7c18c42489986b0af54b5f472b72 (patch)
treeec5c7eab2d01806177572cda4062a8455f0ca02e
parent6fb3b8c66f27604e91675d89c993f3e465edab15 (diff)
downloadphp-git-b978a64ebb4f7c18c42489986b0af54b5f472b72.tar.gz
Check for htonl in libsocket (sol251), and move inet_aton check in libbind to configure.in, so that our later AC_CHECK_FUNCS(inet_aton) will find inet_aton in libbind (if it is there).
-rw-r--r--configure.in9
-rw-r--r--ext/standard/config.m44
2 files changed, 8 insertions, 5 deletions
diff --git a/configure.in b/configure.in
index 8a3e87134d..632080c3b5 100644
--- a/configure.in
+++ b/configure.in
@@ -168,7 +168,10 @@ AC_CHECK_LIB(nsl, gethostname, [
AC_CHECK_LIB(socket, socket, [
AC_ADD_LIBRARY(socket)
- AC_DEFINE(HAVE_LIBSOCKET) ], [])
+ AC_DEFINE(HAVE_LIBSOCKET) ], [
+ AC_CHECK_LIB(socket, htonl, [
+ AC_ADD_LIBRARY(socket)
+ ])])
AC_CHECK_LIB(nsl, gethostbyaddr, [
AC_ADD_LIBRARY(nsl)
@@ -182,6 +185,10 @@ dnl The sin may be in a library which need not be specifed
dnl as well as res_search resides in libsocket
AC_CHECK_LIB(m, sin)
+AC_CHECK_LIB(bind, inet_aton, [
+ EXTRA_LIBS="$EXTRA_LIBS -lbind"
+ AC_DEFINE(HAVE_LIBBIND) ], [])
+
AC_CHECK_LIB(resolv, inet_aton)
dnl The res_search may be in libsocket as well, and if it is
diff --git a/ext/standard/config.m4 b/ext/standard/config.m4
index c6e9c578ae..33852add19 100644
--- a/ext/standard/config.m4
+++ b/ext/standard/config.m4
@@ -110,10 +110,6 @@ AC_CHECK_LIB(pam, pam_start, [
EXTRA_LIBS="$EXTRA_LIBS -lpam"
AC_DEFINE(HAVE_LIBPAM) ], [])
-AC_CHECK_LIB(bind, inet_aton, [
- EXTRA_LIBS="$EXTRA_LIBS -lbind"
- AC_DEFINE(HAVE_LIBBIND) ], [])
-
AC_CHECK_LIB(crypt, crypt, [
AC_ADD_LIBRARY(crypt)
AC_DEFINE(HAVE_LIBCRYPT) ], [])