ext/lcg -> ext/standard in various places

diff --git a/buildconf b/buildconf
index b5091e4c458d3a03a87cb2bda5d7320d64ac2d6d..1596430f8212f530f0916f87bc2083987b068cc9 100755 (executable)
--- a/buildconf
+++ b/buildconf
@@ -47,7 +47,7 @@ else
        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 @@ else
     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

diff --git a/ext/session/session.c b/ext/session/session.c
index 7b4bb8988d0420ee8515f9fe3028397f5c229593..9edfc16f0f30f1fb059a75b2299b658ba402e108 100644 (file)
--- a/ext/session/session.c
+++ b/ext/session/session.c
@@ -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;

diff --git a/ext/standard/uniqid.c b/ext/standard/uniqid.c
index 562eb72b4e47ee80ac6fbb891bd91a1c42bb3d7f..299f6731c2840509f5b79210f9bd247b6246c5f4 100644 (file)
--- a/ext/standard/uniqid.c
+++ b/ext/standard/uniqid.c
@@ -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])

diff --git a/main/internal_functions_win32.c b/main/internal_functions_win32.c
index 9079b7d9f37fb392cde1fa2d1fa112424ca6ada3..f9312062a04503e943f5a17d89436a034268847c 100644 (file)
--- a/main/internal_functions_win32.c
+++ b/main/internal_functions_win32.c
@@ -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" */