cvs: /php4 configure.in.in
| From: | Sascha Schumann | Date: | Tue, 21 Sep 1999 14:51:25 +0000 |
| Subject: | cvs: /php4 configure.in.in | ||
| Groups: | php.version4 | ||
| Request: | Send a blank email to php-version4+get-4747@lists.php.net to get a copy of this message | ||
sas Tue Sep 21 10:51:25 1999 EDT
Modified files:
/php4 configure.in.in
Log:
* Do not check explicitly for symbols in the C library (fixes #2339)
* sort function checks
Index: php4/configure.in.in
diff -u php4/configure.in.in:1.85 php4/configure.in.in:1.86
--- php4/configure.in.in:1.85 Tue Sep 21 04:37:27 1999
+++ php4/configure.in.in Tue Sep 21 10:51:24 1999
@@ -1,4 +1,4 @@
-dnl $Id: configure.in.in,v 1.85 1999/09/21 08:37:27 sas Exp $ -*- sh -*-
+dnl $Id: configure.in.in,v 1.86 1999/09/21 14:51:24 sas Exp $ -*- sh -*-
dnl Process this file with autoconf to produce a configure script.
divert(0)
@@ -208,28 +208,24 @@
AC_SUBST(INCLUDES)
AC_CHECK_LIB(nsl, gethostname, [
- LIBS="-lnsl $LIBS"
- AC_DEFINE(HAVE_LIBNSL) ], [])
+ AC_ADD_LIBRARY(nsl)
+ AC_DEFINE(HAVE_LIBNSL) ], [])
-AC_CHECK_LIB(c, socket, [:], [
- AC_CHECK_LIB(socket, socket, [
- LIBS="-lsocket $LIBS"
- AC_DEFINE(HAVE_LIBSOCKET) ], []) ])
-
-AC_CHECK_LIB(c, gethostbyaddr, [:], [
- AC_CHECK_LIB(nsl, gethostbyaddr, [
- LIBS="-lnsl $LIBS"
- AC_DEFINE(HAVE_LIBNSL) ], []) ])
-
-AC_CHECK_LIB(c, crypt, [:], [
- AC_CHECK_LIB(crypt, crypt, [
- LIBS="-lcrypt $LIBS"
- AC_DEFINE(HAVE_LIBCRYPT) ], []) ])
+AC_CHECK_LIB(socket, socket, [
+ AC_ADD_LIBRARY(socket)
+ AC_DEFINE(HAVE_LIBSOCKET) ], [])
+
+AC_CHECK_LIB(nsl, gethostbyaddr, [
+ AC_ADD_LIBRARY(nsl)
+ AC_DEFINE(HAVE_LIBNSL) ], [])
+
+AC_CHECK_LIB(crypt, crypt, [
+ AC_ADD_LIBRARY(crypt)
+ AC_DEFINE(HAVE_LIBCRYPT) ], [])
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(c, sin, [:], [
- AC_CHECK_LIB(m, sin) ])
+AC_CHECK_LIB(m, sin)
dnl The res_search may be in libsocket as well, and if it is
dnl make sure to check for dn_skipname in libresolv, or if res_search
@@ -345,7 +341,50 @@
dnl Checks for library functions.
AC_FUNC_VPRINTF
-AC_CHECK_FUNCS(memcpy memmove strdup strerror strcasecmp strstr flock lockf putenv tempnam usleep
setlocale gettimeofday setvbuf srand48 lrand48 srandom random link symlink regcomp getlogin cuserid
vsnprintf snprintf gcvt utime crypt rint setitimer unsetenv strftime setsockopt tzset shutdown
inet_aton statvfs statfs mmap)
+AC_CHECK_FUNCS(
+crypt \
+cuserid \
+flock \
+gcvt \
+getlogin \
+gethostbyaddr \
+gettimeofday \
+inet_aton \
+link \
+lockf \
+lrand48 \
+memcpy \
+memmove \
+mmap \
+putenv \
+random \
+regcomp \
+rint \
+setitimer \
+setlocale \
+setsockopt \
+setvbuf \
+shutdown \
+sin \
+snprintf \
+srand48 \
+srandom \
+statfs \
+statvfs \
+strcasecmp \
+strdup \
+strerror \
+strftime \
+strstr \
+symlink \
+tempnam \
+tzset \
+unsetenv \
+usleep \
+utime \
+vsnprintf \
+)
+
AC_REPLACE_FUNCS(strlcat strlcpy)
AC_FUNC_UTIME_NULL
AC_FUNC_ALLOCA