cvs: /php4 buildconf internal_functions_win32.c /php4/ext/session session.c /php4/ext/standard uniqid.c

ssb Tue Aug 31 14:05:23 1999 EDT Modified files: /php4 buildconf internal_functions_win32.c /php4/ext/session session.c /php4/ext/standard uniqid.c Log: ext/lcg -> ext/standard in various places Index: php4/buildconf diff -u php4/buildconf:1.28 php4/buildconf:1.29 --- php4/buildconf:1.28 Mon Aug 23 18:43:18 1999 +++ php4/buildconf Tue Aug 31 14:05:21 1999 @@ -47,7 +47,7 @@ echo "buildconf: automake version $am_version (ok)" fi - # libtool 1.2f or newer + # libtool 1.3.3 or newer lt_pversion=libtool --version 2>/dev/null|sed -e 's/^[^0-9]*//' -e 's/ .*//' if test "$lt_pversion" = ""; then echo "buildconf: libtool not found." @@ -57,12 +57,12 @@ fi lt_version=echo $lt_pversion|sed -e 's/\([a-z]*\)$/.\1/' IFS=.; set $lt_version; IFS=' ' - if test "$1" -gt "1" || test "$2" -ge "3" || test "$2" = "2" -a "$3" = "f" + if test "$1" -gt "1" || test "$2" -gt "3" || test "$2" = "3" -a "$3" -ge "3" then echo "buildconf: libtool version $lt_pversion (ok)" else echo "buildconf: libtool version $lt_pversion found." - echo " You need libtool version 1.2f or newer installed" + echo " You need libtool version 1.3.3 or newer installed" echo " to build PHP from CVS." exit 1 fi Index: php4/internal_functions_win32.c diff -u php4/internal_functions_win32.c:1.9 php4/internal_functions_win32.c:1.10 --- php4/internal_functions_win32.c:1.9 Sun Aug 22 15:19:42 1999 +++ php4/internal_functions_win32.c Tue Aug 31 14:05:21 1999 @@ -18,7 +18,7 @@ */ -/* $Id: internal_functions_win32.c,v 1.9 1999/08/22 19:19:42 andi Exp $ */ +/* $Id: internal_functions_win32.c,v 1.10 1999/08/31 18:05:21 ssb Exp $ */ #include "php.h" @@ -44,11 +44,11 @@ #include "ext/standard/php3_mail.h" #include "ext/standard/php3_syslog.h" #include "ext/standard/php3_standard.h" +#include "ext/standard/php_lcg.h" #include "ext/COM/php3_COM.h" #include "ext/standard/reg.h" #include "ext/pcre/php_pcre.h" #include "ext/odbc/php3_odbc.h" -#include "ext/lcg/php_lcg.h" /* SNMP has to be moved to ext */ /* #include "dl/snmp/php3_snmp.h" */ Index: php4/ext/session/session.c diff -u php4/ext/session/session.c:1.36 php4/ext/session/session.c:1.37 --- php4/ext/session/session.c:1.36 Fri Aug 27 17:03:22 1999 +++ php4/ext/session/session.c Tue Aug 31 14:05:22 1999 @@ -36,7 +36,7 @@ #include "ext/standard/md5.h" #include "ext/standard/php3_var.h" #include "ext/standard/datetime.h" -#include "ext/lcg/php_lcg.h" +#include "ext/session/php_lcg.h" #ifdef ZTS int ps_globals_id; Index: php4/ext/standard/uniqid.c diff -u php4/ext/standard/uniqid.c:1.9 php4/ext/standard/uniqid.c:1.10 --- php4/ext/standard/uniqid.c:1.9 Tue Aug 31 11:57:30 1999 +++ php4/ext/standard/uniqid.c Tue Aug 31 14:05:22 1999 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: uniqid.c,v 1.9 1999/08/31 15:57:30 ssb Exp $ */ +/* $Id: uniqid.c,v 1.10 1999/08/31 18:05:22 ssb Exp $ */ #include "php.h" @@ -35,7 +35,7 @@ #include <sys/time.h> #endif -#include "../lcg/php_lcg.h" +#include "php_lcg.h" #include "uniqid.h" /* {{{ proto string uniqid(string prefix, [bool more_entropy])