CVS update: php3

Date: Monday September 21, 1998 @ 23:02 Author: rasmus Update of /repository/php3 In directory asf:/u2/tmp/cvs-serv6779 Modified Files: aclocal.m4 configure.in Log Message: Don't test crypt function unless crypt function is actually found. Start crypt() work Index: php3/aclocal.m4 diff -c php3/aclocal.m4:1.26 php3/aclocal.m4:1.27 *** php3/aclocal.m4:1.26 Mon Sep 21 22:32:35 1998 --- php3/aclocal.m4 Mon Sep 21 23:02:28 1998 *************** *** 1,4 **** ! dnl $Id: aclocal.m4,v 1.26 1998/09/22 02:32:35 rasmus Exp $ dnl dnl This file contains local autoconf functions. --- 1,4 ---- ! dnl $Id: aclocal.m4,v 1.27 1998/09/22 03:02:28 rasmus Exp $ dnl dnl This file contains local autoconf functions. *************** *** 119,125 **** --- 119,129 ---- AC_MSG_CHECKING([for standard DES crypt]) AC_TRY_RUN([ main() { + #if HAVE_CRYPT exit (strcmp((char *)crypt("rasmuslerdorf","rl"),"rl.3StKT.4T8M")); + #else + exit(0); + #endif }],[ AC_DEFINE(PHP3_STD_DES_CRYPT,1) AC_MSG_RESULT(yes) *************** *** 134,140 **** --- 138,148 ---- AC_MSG_CHECKING([for extended DES crypt]) AC_TRY_RUN([ main() { + #if HAVE_CRYPT exit (strcmp((char *)crypt("rasmuslerdorf","_J9..rasm"),"_J9..rasmBYk8r9AiWNc")); + #else + exit(0); + #endif }],[ AC_DEFINE(PHP3_EXT_DES_CRYPT,1) AC_MSG_RESULT(yes) *************** *** 149,154 **** --- 157,163 ---- AC_MSG_CHECKING([for MD5 crypt]) AC_TRY_RUN([ main() { + #if HAVE_CRYPT char salt[15], answer[40]; salt[0]='$'; salt[1]='1'; salt[2]='$'; *************** *** 159,164 **** --- 168,176 ---- strcpy(answer,salt); strcat(answer,"rISCgZzpwk3UhDidwXvin0"); exit (strcmp((char *)crypt("rasmuslerdorf",salt),answer)); + #else + exit(0); + #endif }],[ AC_DEFINE(PHP3_MD5_CRYPT,1) AC_MSG_RESULT(yes) *************** *** 173,178 **** --- 185,191 ---- AC_MSG_CHECKING([for Blowfish crypt]) AC_TRY_RUN([ main() { + #if HAVE_CRYPT char salt[25], answer[70]; salt[0]='$'; salt[1]='2'; salt[2]='a'; salt[3]='$'; salt[4]='0'; salt[5]='7'; salt[6]='$'; salt[7]='\0'; *************** *** 180,185 **** --- 193,201 ---- strcpy(answer,salt); strcpy(&answer[16],"O............gl95GkTKn53Of.H4YchXl5PwvvW.5ri"); exit (strcmp((char *)crypt("rasmuslerdorf",salt),answer)); + #else + exit(0); + #endif }],[ AC_DEFINE(PHP3_BLOWFISH_CRYPT,1) AC_MSG_RESULT(yes) Index: php3/configure.in diff -c php3/configure.in:1.251 php3/configure.in:1.252 *** php3/configure.in:1.251 Mon Sep 21 22:32:35 1998 --- php3/configure.in Mon Sep 21 23:02:30 1998 *************** *** 1,4 **** ! dnl $Id: configure.in,v 1.251 1998/09/22 02:32:35 rasmus Exp $ dnl Process this file with autoconf to produce a configure script. AC_INIT(main.c) --- 1,4 ---- ! dnl $Id: configure.in,v 1.252 1998/09/22 03:02:30 rasmus Exp $ dnl Process this file with autoconf to produce a configure script. AC_INIT(main.c) *************** *** 147,154 **** AC_SUBST(GDBM_INCLUDE) fi - AC_CRYPT_CAP - dnl Checks for typedefs, structures, and compiler characteristics. AC_STRUCT_TM AC_STRUCT_TIMEZONE --- 147,152 ---- *************** *** 180,185 **** --- 178,185 ---- AC_FUNC_ALLOCA AC_BROKEN_SPRINTF AC_REPLACE_FUNCS(getopt) + + AC_CRYPT_CAP AC_MSG_CHECKING(whether to use bundled regex library) AC_ARG_WITH(system-regex, -- PHP Development Mailing List http://www.php.net/ To unsubscribe send an empty message to php-dev-unsubscribe@lists.php.net For help: php-dev-help@lists.php.net