CVS update: php3

Date: Monday September 21, 1998 @ 13:47 Author: rasmus Update of /repository/php3 In directory asf:/u2/tmp/cvs-serv2734 Modified Files: aclocal.m4 configure.in Log Message: Not quite done, but I need to test it on a couple of platforms. Index: php3/aclocal.m4 diff -c php3/aclocal.m4:1.19 php3/aclocal.m4:1.20 *** php3/aclocal.m4:1.19 Thu Jul 2 12:22:47 1998 --- php3/aclocal.m4 Mon Sep 21 13:47:48 1998 *************** *** 1,4 **** ! dnl $Id: aclocal.m4,v 1.19 1998/07/02 16:22:47 ssb Exp $ dnl dnl This file contains local autoconf functions. --- 1,4 ---- ! dnl $Id: aclocal.m4,v 1.20 1998/09/21 17:47:48 rasmus Exp $ dnl dnl This file contains local autoconf functions. *************** *** 111,116 **** --- 111,174 ---- ]) ]) + dnl + dnl Check for crypt() capabilities + dnl + AC_DEFUN(AC_CRYPT_CAP,[ + AC_MSG_CHECKING([for standard DES crypt]) + AC_TRY_RUN([ + main() { + exit (strcmp(crypt("rasmuslerdorf","rl"),"rl.3StKT.4T8M")); + }],[ + AC_DEFINE(STD_DES_CRYPT,1) + AC_MSG_RESULT(ok) + ],[ + AC_DEFINE(STD_DES_CRYPT,0) + AC_MSG_RESULT(fail) + ],[ + AC_DEFINE(STD_DES_CRYPT,1) + AC_MSG_RESULT(cannot check, guessing ok) + ]) + + AC_MSG_CHECKING([for extended DES crypt]) + AC_TRY_RUN([ + main() { + char salt[10]; + salt[0] = '_'; + to64(&salt[1], (long)(29 * 25), 4); + salt[5]='r'; salt[6]='a'; salt[7]='s'; salt[8]='m'; + salt[9] = '\0'; + exit (strcmp(crypt("rasmuslerdorf",salt),"_J9..rasmBYk8r9AiWNc")); + }],[ + AC_DEFINE(EXT_DES_CRYPT,1) + AC_MSG_RESULT(ok) + ],[ + AC_DEFINE(EXT_DES_CRYPT,0) + AC_MSG_RESULT(fail) + ],[ + AC_DEFINE(EXT_DES_CRYPT,0) + AC_MSG_RESULT(cannot check, guessing fail) + ]) + + AC_MSG_CHECKING([for MD5 crypt]) + AC_TRY_RUN([ + main() { + char salt[10]; + strcpy(salt, "$1$rasmu"); + salt[8] = '\0'; + exit (strcmp(crypt("rasmuslerdorf",salt),"$1$rasmu$Fqw49PVuukVZSt4TylIiu.")); + }],[ + AC_DEFINE(MD5_CRYPT,1) + AC_MSG_RESULT(ok) + ],[ + AC_DEFINE(MD5_CRYPT,0) + AC_MSG_RESULT(fail) + ],[ + AC_DEFINE(MD5_CRYPT,0) + AC_MSG_RESULT(cannot check, guessing fail) + ]) + + ]) ## libtool.m4 - Configure libtool for the target system. -*-Shell-script-*- ## Copyright (C) 1996, 1997 Free Software Foundation, Inc. Index: php3/configure.in diff -c php3/configure.in:1.248 php3/configure.in:1.249 *** php3/configure.in:1.248 Mon Sep 21 13:02:19 1998 --- php3/configure.in Mon Sep 21 13:47:49 1998 *************** *** 1,4 **** ! dnl $Id: configure.in,v 1.248 1998/09/21 17:02:19 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.249 1998/09/21 17:47:49 rasmus Exp $ dnl Process this file with autoconf to produce a configure script. AC_INIT(main.c) *************** *** 146,151 **** --- 146,153 ---- ]) AC_SUBST(GDBM_INCLUDE) fi + + AC_CRYPT_CAP dnl Checks for typedefs, structures, and compiler characteristics. AC_STRUCT_TM -- 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