summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSascha Schumann <sas@php.net>1999-09-21 14:51:24 +0000
committerSascha Schumann <sas@php.net>1999-09-21 14:51:24 +0000
commit5d70fbf6c14c3b61d6ce30428e4ee80f5fdd6449 (patch)
tree9e254fe40743d5f51a57a6584c71e362142f9ecc
parent8638a61df9af21afc1413ecfc5e5db22ed978cc1 (diff)
downloadphp-git-5d70fbf6c14c3b61d6ce30428e4ee80f5fdd6449.tar.gz
* Do not check explicitly for symbols in the C library (fixes #2339)
* sort function checks
-rw-r--r--configure.in.in73
1 files changed, 56 insertions, 17 deletions
diff --git a/configure.in.in b/configure.in.in
index 709e43f3bc..6829ffba00 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -208,28 +208,24 @@ INCLUDES="-I\$(top_builddir)/libzend -I\$(top_builddir)/TSRM"
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(socket, socket, [
+ AC_ADD_LIBRARY(socket)
+ AC_DEFINE(HAVE_LIBSOCKET) ], [])
-AC_CHECK_LIB(c, gethostbyaddr, [:], [
- AC_CHECK_LIB(nsl, gethostbyaddr, [
- LIBS="-lnsl $LIBS"
- AC_DEFINE(HAVE_LIBNSL) ], []) ])
+AC_CHECK_LIB(nsl, gethostbyaddr, [
+ AC_ADD_LIBRARY(nsl)
+ AC_DEFINE(HAVE_LIBNSL) ], [])
-AC_CHECK_LIB(c, crypt, [:], [
- AC_CHECK_LIB(crypt, crypt, [
- LIBS="-lcrypt $LIBS"
- AC_DEFINE(HAVE_LIBCRYPT) ], []) ])
+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 @@ AC_CHECK_TYPE( ulong, unsigned long )
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