cvs: /php4 configure.in /php4/ext/standard config.m4
| From: | Sascha Schumann | Date: | Sat, 04 Dec 1999 13:16:34 +0000 |
| Subject: | cvs: /php4 configure.in /php4/ext/standard config.m4 | ||
| Groups: | php.version4 | ||
| Request: | Send a blank email to php-version4+get-7392@lists.php.net to get a copy of this message | ||
sas Sat Dec 4 08:16:34 1999 EDT
Modified files:
/php4 configure.in
/php4/ext/standard config.m4
Log:
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).
Index: php4/configure.in
diff -u php4/configure.in:1.54 php4/configure.in:1.55
--- php4/configure.in:1.54 Fri Dec 3 17:08:32 1999
+++ php4/configure.in Sat Dec 4 08:16:03 1999
@@ -1,4 +1,4 @@
-dnl ## $Id: configure.in,v 1.54 1999/12/03 22:08:32 sas Exp $ -*- sh -*-
+dnl ## $Id: configure.in,v 1.55 1999/12/04 13:16:03 sas Exp $ -*- sh -*-
dnl ## Process this file with autoconf to produce a configure script.
divert(0)
@@ -168,7 +168,10 @@
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)
@@ -181,6 +184,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)
Index: php4/ext/standard/config.m4
diff -u php4/ext/standard/config.m4:1.11 php4/ext/standard/config.m4:1.12
--- php4/ext/standard/config.m4:1.11 Sat Nov 13 11:51:31 1999
+++ php4/ext/standard/config.m4 Sat Dec 4 08:16:04 1999
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.11 1999/11/13 16:51:31 sas Exp $ -*- sh -*-
+dnl $Id: config.m4,v 1.12 1999/12/04 13:16:04 sas Exp $ -*- sh -*-
divert(1)
@@ -109,10 +109,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)