sniper Thu Feb 13 20:27:43 2003 EDT
Modified files: (Branch: PHP_4_3)
/php4 configure.in
/php4/ext/standard config.m4
Log:
- MFH, do not add libcrypt if crypt() is provided by libc.
Index: php4/configure.in
diff -u php4/configure.in:1.396.2.31 php4/configure.in:1.396.2.32
--- php4/configure.in:1.396.2.31 Tue Feb 11 22:15:04 2003
+++ php4/configure.in Thu Feb 13 20:27:42 2003
@@ -1,4 +1,4 @@
-dnl ## $Id: configure.in,v 1.396.2.31 2003/02/12 03:15:04 sniper Exp $ -*- sh -*-
+dnl ## $Id: configure.in,v 1.396.2.32 2003/02/14 01:27:42 sniper Exp $ -*- sh -*-
dnl ## Process this file with autoconf to produce a configure script.
divert(1)
@@ -734,13 +734,6 @@
PHP_SETUP_OPENSSL
fi
-
-AC_CHECK_LIB(crypt, crypt, [
- PHP_ADD_LIBRARY(crypt)
- PHP_ADD_LIBRARY(crypt, 1)
- AC_DEFINE(HAVE_CRYPT,1,[ ])
-])
-
divert(5)
dnl ## In diversion 5 we check which extensions should be compiled.
@@ -821,6 +814,13 @@
PHP_REGEX
EXTRA_LIBS="$EXTRA_LIBS $DLIBS $LIBS"
+
+dnl this has to be here to prevent the openssl crypt() from
+dnl overriding the system provided crypt().
+if test "$ac_cv_lib_crypt_crypt" = "yes"; then
+ EXTRA_LIBS="-lcrypt $EXTRA_LIBS -lcrypt"
+fi
+
unset LIBS LDFLAGS
dnl Configuring Zend and TSRM.
Index: php4/ext/standard/config.m4
diff -u php4/ext/standard/config.m4:1.47.2.1 php4/ext/standard/config.m4:1.47.2.2
--- php4/ext/standard/config.m4:1.47.2.1 Thu Feb 13 08:37:05 2003
+++ php4/ext/standard/config.m4 Thu Feb 13 20:27:42 2003
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.47.2.1 2003/02/13 13:37:05 wez Exp $ -*- sh -*-
+dnl $Id: config.m4,v 1.47.2.2 2003/02/14 01:27:42 sniper Exp $ -*- sh -*-
divert(3)dnl
@@ -58,6 +58,13 @@
dnl
AC_DEFUN(AC_CRYPT_CAP,[
+ if test "$ac_cv_func_crypt" = "no"; then
+ AC_CHECK_LIB(crypt, crypt, [
+ LIBS="-lcrypt $LIBS -lcrypt"
+ AC_DEFINE(HAVE_CRYPT, 1, [ ])
+ ])
+ fi
+
AC_CACHE_CHECK(for standard DES crypt, ac_cv_crypt_des,[
AC_TRY_RUN([
#if HAVE_CRYPT_H
@@ -184,10 +191,6 @@
fi
AC_DEFINE_UNQUOTED(PHP_BLOWFISH_CRYPT, $ac_result, [Whether the system supports
BlowFish salt])
])
-
-dnl AC_CHECK_LIB(pam, pam_start, [
-dnl EXTRA_LIBS="$EXTRA_LIBS -lpam"
-dnl AC_DEFINE(HAVE_LIBPAM,1,[ ]) ], [])
AC_CHECK_FUNCS(getcwd getwd asinh acosh atanh log1p hypot)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
