CVS update: php3

Date: Monday September 21, 1998 @ 22:32 Author: rasmus Update of /repository/php3 In directory asf:/u2/tmp/cvs-serv6553 Modified Files: aclocal.m4 configure.in Log Message: A couple of configure cleanups. Just making the output pretty. Index: php3/aclocal.m4 diff -c php3/aclocal.m4:1.25 php3/aclocal.m4:1.26 *** php3/aclocal.m4:1.25 Mon Sep 21 18:35:50 1998 --- php3/aclocal.m4 Mon Sep 21 22:32:35 1998 *************** *** 1,4 **** ! dnl $Id: aclocal.m4,v 1.25 1998/09/21 22:35:50 rasmus Exp $ dnl dnl This file contains local autoconf functions. --- 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. *************** *** 122,134 **** exit (strcmp((char *)crypt("rasmuslerdorf","rl"),"rl.3StKT.4T8M")); }],[ AC_DEFINE(PHP3_STD_DES_CRYPT,1) ! AC_MSG_RESULT(ok) ],[ AC_DEFINE(PHP3_STD_DES_CRYPT,0) ! AC_MSG_RESULT(fail) ],[ AC_DEFINE(PHP3_STD_DES_CRYPT,1) ! AC_MSG_RESULT(cannot check, guessing ok) ]) AC_MSG_CHECKING([for extended DES crypt]) --- 122,134 ---- exit (strcmp((char *)crypt("rasmuslerdorf","rl"),"rl.3StKT.4T8M")); }],[ AC_DEFINE(PHP3_STD_DES_CRYPT,1) ! AC_MSG_RESULT(yes) ],[ AC_DEFINE(PHP3_STD_DES_CRYPT,0) ! AC_MSG_RESULT(no) ],[ AC_DEFINE(PHP3_STD_DES_CRYPT,1) ! AC_MSG_RESULT(cannot check, guessing yes) ]) AC_MSG_CHECKING([for extended DES crypt]) *************** *** 137,149 **** exit (strcmp((char *)crypt("rasmuslerdorf","_J9..rasm"),"_J9..rasmBYk8r9AiWNc")); }],[ AC_DEFINE(PHP3_EXT_DES_CRYPT,1) ! AC_MSG_RESULT(ok) ],[ AC_DEFINE(PHP3_EXT_DES_CRYPT,0) ! AC_MSG_RESULT(fail) ],[ AC_DEFINE(PHP3_EXT_DES_CRYPT,0) ! AC_MSG_RESULT(cannot check, guessing fail) ]) AC_MSG_CHECKING([for MD5 crypt]) --- 137,149 ---- exit (strcmp((char *)crypt("rasmuslerdorf","_J9..rasm"),"_J9..rasmBYk8r9AiWNc")); }],[ AC_DEFINE(PHP3_EXT_DES_CRYPT,1) ! AC_MSG_RESULT(yes) ],[ AC_DEFINE(PHP3_EXT_DES_CRYPT,0) ! AC_MSG_RESULT(no) ],[ AC_DEFINE(PHP3_EXT_DES_CRYPT,0) ! AC_MSG_RESULT(cannot check, guessing no) ]) AC_MSG_CHECKING([for MD5 crypt]) *************** *** 161,173 **** exit (strcmp((char *)crypt("rasmuslerdorf",salt),answer)); }],[ AC_DEFINE(PHP3_MD5_CRYPT,1) ! AC_MSG_RESULT(ok) ],[ AC_DEFINE(PHP3_MD5_CRYPT,0) ! AC_MSG_RESULT(fail) ],[ AC_DEFINE(PHP3_MD5_CRYPT,0) ! AC_MSG_RESULT(cannot check, guessing fail) ]) AC_MSG_CHECKING([for Blowfish crypt]) --- 161,173 ---- exit (strcmp((char *)crypt("rasmuslerdorf",salt),answer)); }],[ AC_DEFINE(PHP3_MD5_CRYPT,1) ! AC_MSG_RESULT(yes) ],[ AC_DEFINE(PHP3_MD5_CRYPT,0) ! AC_MSG_RESULT(no) ],[ AC_DEFINE(PHP3_MD5_CRYPT,0) ! AC_MSG_RESULT(cannot check, guessing no) ]) AC_MSG_CHECKING([for Blowfish crypt]) *************** *** 182,194 **** exit (strcmp((char *)crypt("rasmuslerdorf",salt),answer)); }],[ AC_DEFINE(PHP3_BLOWFISH_CRYPT,1) ! AC_MSG_RESULT(ok) ],[ AC_DEFINE(PHP3_BLOWFISH_CRYPT,0) ! AC_MSG_RESULT(fail) ],[ AC_DEFINE(PHP3_BLOWFISH_CRYPT,0) ! AC_MSG_RESULT(cannot check, guessing fail) ]) ]) --- 182,194 ---- exit (strcmp((char *)crypt("rasmuslerdorf",salt),answer)); }],[ AC_DEFINE(PHP3_BLOWFISH_CRYPT,1) ! AC_MSG_RESULT(yes) ],[ AC_DEFINE(PHP3_BLOWFISH_CRYPT,0) ! AC_MSG_RESULT(no) ],[ AC_DEFINE(PHP3_BLOWFISH_CRYPT,0) ! AC_MSG_RESULT(cannot check, guessing no) ]) ]) Index: php3/configure.in diff -c php3/configure.in:1.250 php3/configure.in:1.251 *** php3/configure.in:1.250 Mon Sep 21 17:44:01 1998 --- php3/configure.in Mon Sep 21 22:32:35 1998 *************** *** 1,4 **** ! dnl $Id: configure.in,v 1.250 1998/09/21 21:44:01 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.251 1998/09/22 02:32:35 rasmus Exp $ dnl Process this file with autoconf to produce a configure script. AC_INIT(main.c) *************** *** 515,523 **** yes) GD_LIBS="-lgd" AC_DEFINE(HAVE_LIBGD) AC_CHECK_LIB(gd, gdImageString16, [ AC_DEFINE(HAVE_LIBGD13) ]) ac_cv_lib_gd_gdImageLine=yes ! AC_MSG_RESULT(yes) ;; *) dnl A whole whack of possible places where this might be test -f $withval/include/gd1.3/gd.h && GD_INCLUDE="-I$withval/include/gd1.3" --- 515,524 ---- yes) GD_LIBS="-lgd" AC_DEFINE(HAVE_LIBGD) + AC_MSG_RESULT(yes) AC_CHECK_LIB(gd, gdImageString16, [ AC_DEFINE(HAVE_LIBGD13) ]) ac_cv_lib_gd_gdImageLine=yes ! ;; *) dnl A whole whack of possible places where this might be test -f $withval/include/gd1.3/gd.h && GD_INCLUDE="-I$withval/include/gd1.3" *************** *** 537,545 **** if test -n "$GD_INCLUDE" && test -n "$GD_LIB" ; then GD_LIBS="-L$GD_LIB -lgd" AC_DEFINE(HAVE_LIBGD) - AC_CHECK_LIB(gd, gdImageString16, [ AC_DEFINE(HAVE_LIBGD13) ]) - ac_cv_lib_gd_gdImageLine=yes AC_MSG_RESULT(yes) else AC_MSG_RESULT(no) fi ;; --- 538,546 ---- if test -n "$GD_INCLUDE" && test -n "$GD_LIB" ; then GD_LIBS="-L$GD_LIB -lgd" AC_DEFINE(HAVE_LIBGD) AC_MSG_RESULT(yes) + AC_CHECK_LIB(gd, gdImageString16, [ AC_DEFINE(HAVE_LIBGD13) ]) + ac_cv_lib_gd_gdImageLine=yes else AC_MSG_RESULT(no) fi ;; -- 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