cvs: /php4 configure.in /php4/ext/standard config.m4

sas Fri May 5 04:23:12 2000 EDT Modified files: /php4 configure.in /php4/ext/standard config.m4 Log: Move dlopen in -ldl check to configure.in. This should ensure that if libdl exists, it will be always found. We define HAVE_LIBDL now always, if the function dlopen is found. Index: php4/configure.in diff -u php4/configure.in:1.119 php4/configure.in:1.120 --- php4/configure.in:1.119 Thu May 4 04:57:59 2000 +++ php4/configure.in Fri May 5 04:23:11 2000 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.119 2000/05/04 11:57:59 sas Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.120 2000/05/05 11:23:11 sas Exp $ -*- sh -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -202,6 +202,8 @@ AC_CHECK_LIB(crypt, crypt, [ AC_ADD_LIBRARY(crypt) AC_DEFINE(HAVE_LIBCRYPT,1,[ ]) ], []) + +AC_CHECK_LIB(dl, dlopen,[AC_ADD_LIBRARY(dl)]) dnl The sin may be in a library which need not be specifed dnl as well as res_search resides in libsocket Index: php4/ext/standard/config.m4 diff -u php4/ext/standard/config.m4:1.20 php4/ext/standard/config.m4:1.21 --- php4/ext/standard/config.m4:1.20 Thu May 4 02:42:27 2000 +++ php4/ext/standard/config.m4 Fri May 5 04:23:12 2000 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.20 2000/05/04 09:42:27 sas Exp $ -*- sh -*- +dnl $Id: config.m4,v 1.21 2000/05/05 11:23:12 sas Exp $ -*- sh -*- divert(3)dnl @@ -115,45 +115,33 @@ AC_DEFINE_UNQUOTED(PHP_BLOWFISH_CRYPT, $ac_result, [Whether the system supports BlowFish salt]) ]) -AC_CHECK_LIB(c, dlopen, [ - # fake it - AC_DEFINE(HAVE_LIBDL,1,[ ]) ], [ - AC_CHECK_LIB(dl, dlopen, [ - LIBS="-ldl $LIBS" - AC_DEFINE(HAVE_LIBDL,1,[ ]) ], []) ]) +AC_CHECK_FUNC(dlopen, [AC_DEFINE(HAVE_LIBDL,1,[ ])]) AC_CHECK_LIB(pam, pam_start, [ EXTRA_LIBS="$EXTRA_LIBS -lpam" AC_DEFINE(HAVE_LIBPAM,1,[ ]) ], []) -AC_CHECK_LIB(crypt, crypt, [ - AC_ADD_LIBRARY(crypt) - AC_DEFINE(HAVE_LIBCRYPT,1,[ ]) ], []) +AC_CHECK_FUNCS(getcwd getwd) -AC_CHECK_FUNCS(getcwd) -AC_CHECK_FUNCS(getwd) +AC_CRYPT_CAP divert(5)dnl AC_ARG_WITH(regex, -[ --with-regex=TYPE regex library type: system, apache, php], -[ +[ --with-regex=TYPE regex library type: system, apache, php],[ REGEX_TYPE=$withval ],[ REGEX_TYPE=php ]) AC_ARG_WITH(system-regex, -[ --with-system-regex (deprecated) Use system regex library], -[ +[ --with-system-regex (deprecated) Use system regex library],[ if test "$withval" = "yes"; then REGEX_TYPE=system else REGEX_TYPE=php fi ]) - -AC_CRYPT_CAP PHP_EXTENSION(standard)