summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStig Bakken <ssb@php.net>1999-08-31 18:05:22 +0000
committerStig Bakken <ssb@php.net>1999-08-31 18:05:22 +0000
commit4092f4b8c07ffa3272996549bdf454cea7af725e (patch)
tree006eea6414c01a62bc56ca7c171b94a1f92126ef
parentb5375a323d153b43c3ee273d2cbea70e6320227d (diff)
downloadphp-git-4092f4b8c07ffa3272996549bdf454cea7af725e.tar.gz
ext/lcg -> ext/standard in various places
-rwxr-xr-xbuildconf6
-rw-r--r--ext/session/session.c2
-rw-r--r--ext/standard/uniqid.c2
-rw-r--r--main/internal_functions_win32.c2
4 files changed, 6 insertions, 6 deletions
diff --git a/buildconf b/buildconf
index b5091e4c45..1596430f82 100755
--- 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 7b4bb8988d..9edfc16f0f 100644
--- 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 562eb72b4e..299f6731c2 100644
--- 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 9079b7d9f3..f9312062a0 100644
--- 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" */