 |
 |
 |
 |
|
|
Date: 06/30/99
- Next message: sas: "[PHP-DEV] CVS update: php3/functions"
- Previous message: fleury.id <email protected>: "[PHP-DEV] Bug #1641: SYBASE float returns integer value in php script"
- Next in thread: sas: "[PHP-DEV] CVS update: php3"
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Date: Wednesday June 30, 1999 @ 20:03
Author: sas
Update of /repository/php3
In directory php:/tmp/cvs-serv21288
Modified Files:
Makefile.in aclocal.m4 config.h.in configure.in
libphp3.module.in php.h
Log Message:
* --with-shared-apache works again (for legacy users mostly)
This uses RPATHS correctly now
* initial try to get 'make test' run in a VPATH environment
(test/testphp needs a change, but I don't know awk very well)
* avoid name clash on glibc2 systems which have BerkeleyDB installed
/usr/include/db1 contains "db.h", breaking dba_db2.c
* revert patch for PostgreSQL, should work now fine again
* revert HSREGEX patch, I misinterpreted HS for HoSt == system :-(
Index: php3/Makefile.in
diff -u php3/Makefile.in:1.333 php3/Makefile.in:1.334
--- php3/Makefile.in:1.333 Mon Jun 28 00:03:56 1999
+++ php3/Makefile.in Wed Jun 30 20:03:51 1999
@@ -24,7 +24,7 @@
# +----------------------------------------------------------------------+
#
-# $Id: Makefile.in,v 1.333 1999/06/28 04:03:56 sas Exp $
+# $Id: Makefile.in,v 1.334 1999/07/01 00:03:51 sas Exp $
#
prefix = <email protected>@
@@ -55,6 +55,7 @@
APXS_EXP = <email protected>@
WARNING_LEVEL = <email protected>@
DBF_OBJS=dbase/dbf_head.o dbase/dbf_rec.o dbase/dbf_misc.o dbase/dbf_ndx.o
+PCRE_OBJS=pcrelib/maketables.o pcrelib/get.o pcrelib/study.o pcrelib/pcre.o
LEX_CFLAGS = -w$(WARNING_LEVEL) <email protected>@
SOURCE = language-parser.tab.c language-scanner.c main.c php3_hash.c operators.c \
@@ -112,15 +113,15 @@
$(CC) $(CFLAGS) -o $(BINNAME) $(LDFLAGS) $(OBJS) $(FUNCTIONS) $(LIBS)
libphp3.a: $(OBJS) $(FUNCTIONS) <email protected>@ <email protected>@
- $(AR) $(BINNAME) $(OBJS) $(FUNCTIONS) <email protected>@
+ $(AR) $(BINNAME) $(OBJS) $(FUNCTIONS) <email protected>@ <email protected>@
$(RANLIB) $(BINNAME)
libmodphp3.a: $(OBJS) $(FUNCTIONS) <email protected>@ <email protected>@
- $(AR) $(BINNAME) $(OBJS) $(FUNCTIONS) <email protected>@
+ $(AR) $(BINNAME) $(OBJS) $(FUNCTIONS) <email protected>@ <email protected>@
$(RANLIB) $(BINNAME)
libmodphp3-so.a: $(OBJS) $(FUNCTIONS) <email protected>@ <email protected>@
- $(AR) libmodphp3-so.a $(OBJS) $(FUNCTIONS) <email protected>@
+ $(AR) libmodphp3-so.a $(OBJS) $(FUNCTIONS) <email protected>@ <email protected>@
$(RANLIB) libmodphp3-so.a
libphp3.so: mod_php3.c libmodphp3-so.a <email protected>@ <email protected>@
@@ -186,6 +187,7 @@
# can't use a single rule for this because 'test' is a directory
test: regression
regression check: $(BINNAME)
+ test -d test || $(LN_S) $(srcdir)/test test
cd test && ./testall
config.status: $(srcdir)/configure
@@ -207,7 +209,7 @@
config.h.in: <email protected>@ stamp-h.in
stamp-h.in: configure.in aclocal.m4 acconfig.h
- cd ${srcdir} && autoheader && touch ${srcdir}/stamp-h.in
+ cd ${srcdir} && autoheader && touch stamp-h.in
install: $(BINNAME)
$(INSTALL_IT)
Index: php3/aclocal.m4
diff -u php3/aclocal.m4:1.43 php3/aclocal.m4:1.44
--- php3/aclocal.m4:1.43 Sun Jun 27 13:39:22 1999
+++ php3/aclocal.m4 Wed Jun 30 20:03:52 1999
@@ -1,4 +1,4 @@
-dnl $Id: aclocal.m4,v 1.43 1999/06/27 17:39:22 sas Exp $
+dnl $Id: aclocal.m4,v 1.44 1999/07/01 00:03:52 sas Exp $
dnl
dnl This file contains local autoconf functions.
@@ -41,7 +41,9 @@
AC_EXPAND_PATH($1, ai_p)
AC_PHP_ONCE(LIBPATH, $ai_p, [
EXTRA_LIBS="$EXTRA_LIBS -L$ai_p"
- if test -n "$APXS" ; then
+ if test -n "$rpath_raw" ; then
+ RPATHS="$RPATHS ${raw_runpath_switch}$ai_p"
+ elif test -n "$APXS" ; then
RPATHS="$RPATHS ${apxs_runpath_switch}$ai_p'"
else
RPATHS="$RPATHS ${ld_runpath_switch}$ai_p"
Index: php3/config.h.in
diff -u php3/config.h.in:1.176 php3/config.h.in:1.177
--- php3/config.h.in:1.176 Mon Jun 28 15:57:51 1999
+++ php3/config.h.in Wed Jun 30 20:03:52 1999
@@ -411,12 +411,12 @@
/* Define if you have the getpgid function. */
#undef HAVE_GETPGID
-/* Define if you have the getsid function. */
-#undef HAVE_GETSID
-
/* Define if you have the getrlimit function. */
#undef HAVE_GETRLIMIT
+/* Define if you have the getsid function. */
+#undef HAVE_GETSID
+
/* Define if you have the gettimeofday function. */
#undef HAVE_GETTIMEOFDAY
@@ -542,6 +542,9 @@
/* Define if you have the <fcntl.h> header file. */
#undef HAVE_FCNTL_H
+
+/* Define if you have the <features.h> header file. */
+#undef HAVE_FEATURES_H
/* Define if you have the <grp.h> header file. */
#undef HAVE_GRP_H
Index: php3/configure.in
diff -u php3/configure.in:1.421 php3/configure.in:1.422
--- php3/configure.in:1.421 Wed Jun 30 16:40:28 1999
+++ php3/configure.in Wed Jun 30 20:03:52 1999
@@ -1,4 +1,4 @@
-dnl $Id: configure.in,v 1.421 1999/06/30 20:40:28 steinm Exp $
+dnl $Id: configure.in,v 1.422 1999/07/01 00:03:52 sas Exp $
dnl Process this file with autoconf to produce a configure script.
AC_INIT(main.c)
@@ -62,6 +62,7 @@
if test $php_cv_cc_dashr = "yes"; then
ld_runpath_switch="-R"
apxs_runpath_switch="-Wl,-R'"
+ raw_runpath_switch="-R"
else
AC_MSG_CHECKING([if compiler supports -Wl,-rpath,])
AC_CACHE_VAL(php_cv_cc_rpath,[
@@ -73,10 +74,12 @@
if test $php_cv_cc_rpath = "yes"; then
ld_runpath_switch="-Wl,-rpath,"
apxs_runpath_switch="-Wl,'-rpath "
+ raw_runpath_switch="-rpath "
else
dnl something innocuous
ld_runpath_switch="-L"
apxs_runpath_switch="-L'"
+ raw_runpath_switch="-L"
fi
fi
@@ -169,7 +172,7 @@
fi
AC_MISSING_FCLOSE_DECL
dnl QNX requires unix.h to allow functions in libunix to work properly
-AC_CHECK_HEADERS(fcntl.h unistd.h crypt.h sys/file.h memory.h pwd.h grp.h sys/socket.h sys/wait.h syslog.h string.h sys/varargs.h stdarg.h sys/resource.h sys/time.h signal.h netinet/in.h dlfcn.h limits.h sys/types.h sys/statvfs.h sys/statfs.h unix.h db.h dbm.h ndbm.h db1/ndbm.h locale.h)
+AC_CHECK_HEADERS(fcntl.h unistd.h crypt.h sys/file.h memory.h pwd.h grp.h sys/socket.h sys/wait.h syslog.h string.h sys/varargs.h stdarg.h sys/resource.h sys/time.h signal.h netinet/in.h dlfcn.h limits.h sys/types.h sys/statvfs.h sys/statfs.h unix.h db.h dbm.h ndbm.h db1/ndbm.h locale.h features.h)
dnl Checks for typedefs, structures, and compiler characteristics.
AC_STRUCT_TM
@@ -301,15 +304,8 @@
withval=/usr/local/etc/httpd
fi
if test "$withval" != "no"; then
+ rpath_raw=yes
# figure out extra library nonsense
- if test "$with_dbase" = "yes"; then
- extra_copy="$extra_copy dbase/libdbf.a"
- extra_l="$extra_l -ldbf"
- fi
- if test "$with_pcre_regex" != "no"; then
- extra_copy="$extra_copy pcrelib/libpcre.a"
- extra_l="$extra_l -lpcre"
- fi
if test -f $withval/src/include/httpd.h; then
APACHE_INCLUDE="-I$withval/src/include -I$withval/src/os/unix"
APACHE_TARGET=$withval/src/modules/php3
@@ -319,7 +315,6 @@
CFLAGS_SHLIB=`perl -V:cccdlflags | cut -d\' -f2`
LDFLAGS_SHLIB=`perl -V:lddlflags | cut -d\' -f2`
LDFLAGS_SHLIB_EXPORT=`perl -V:ccdlflags | cut -d\' -f2`
- PHP_LIBS=$extra_l
BINNAME=libmodphp3-so.a
INSTALL_IT="mkdir -p $APACHE_TARGET; cp $BINNAME $srcdir/mod_php3.* $srcdir/php_version.h libphp3.module $extra_copy $APACHE_TARGET; cp $srcdir/apMakefile.tmpl $APACHE_TARGET/Makefile.tmpl; cp $srcdir/apMakefile.libdir $APACHE_TARGET/Makefile.libdir"
AC_DEFINE(APACHE)
@@ -365,14 +360,6 @@
fi
if test "$withval" != "no"; then
# figure out extra library nonsense
- if test "$with_dbase" = "yes"; then
- extra_copy="$extra_copy dbase/libdbf.a"
- extra_l="$extra_l -ldbf"
- fi
- if test "$with_pcre_regex" != "no"; then
- extra_copy="$extra_copy pcrelib/libpcre.a"
- extra_l="$extra_l -lpcre"
- fi
# For Apache 1.2.x
if test -f $withval/src/httpd.h; then
APACHE_INCLUDE=-I$withval/src
@@ -489,7 +476,7 @@
[ --with-system-regex Do not use the bundled regex library],
[
if test -n "$APXS"; then
- if test -z "`$APXS -q CFLAGS | grep USE_HSREGEX`"; then
+ if test -n "`$APXS -q CFLAGS | grep USE_HSREGEX`"; then
REGEX_LIB=regex/libregex.a
HSREGEX=yes
AC_MSG_RESULT(yes)
@@ -516,7 +503,7 @@
fi
],[
if test -n "$APXS"; then
- if test -z "`$APXS -q CFLAGS | grep USE_HSREGEX`"; then
+ if test -n "`$APXS -q CFLAGS | grep USE_HSREGEX`"; then
REGEX_LIB=regex/libregex.a
HSREGEX=yes
AC_MSG_RESULT(yes)
@@ -2458,10 +2445,6 @@
eval "AC_DEFINE($NDBM_EXTRA, 1)"
fi
- if test "$NDBM_EXTRA" = "NDBM_DB1_NDBM_H" ; then
- CFLAGS="-I$THIS_PREFIX/include/db1 $CFLAGS"
- fi
-
for LIB in db1 ndbm c; do
AC_TEMP_LDFLAGS(-L$THIS_PREFIX/lib,[
AC_CHECK_LIB($LIB, dbm_open, [AC_DEFINE(DBA_NDBM,1) THIS_LIBS="$LIB"])
@@ -2651,6 +2634,7 @@
if test "$withval" = "yes"; then
PCRE_LIB="pcrelib/libpcre.a"
PCRE_LIBS="-Lpcrelib -lpcre"
+ PCRE_OBJS="\$(PCRE_OBJS)"
AC_DEFINE(HAVE_PCRE, 1)
AC_MSG_RESULT(yes)
else
@@ -2659,11 +2643,13 @@
],[
PCRE_LIB="pcrelib/libpcre.a"
PCRE_LIBS="-Lpcrelib -lpcre"
+ PCRE_OBJS="\$(PCRE_OBJS)"
AC_DEFINE(HAVE_PCRE, 1)
AC_MSG_RESULT(yes)
])
AC_SUBST(PCRE_LIB)
AC_SUBST(PCRE_LIBS)
+AC_SUBST(PCRE_OBJS)
AC_MSG_CHECKING(whether to include POSIX support)
AC_ARG_WITH(posix,
Index: php3/libphp3.module.in
diff -u php3/libphp3.module.in:1.28 php3/libphp3.module.in:1.29
--- php3/libphp3.module.in:1.28 Fri Jun 25 19:33:55 1999
+++ php3/libphp3.module.in Wed Jun 30 20:03:52 1999
@@ -1,7 +1,8 @@
Name: php3_module
ConfigStart
RULE_WANTHSREGEX= <email protected>@
- LIBS=" <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ $LIBS <email protected>@ <email protected>@"
+ LDFLAGS_SHLIB=" <email protected>@ $LDFLAGS_SHLIB"
+ LIBS=" <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ $LIBS <email protected>@ <email protected>@"
RULE_HIDE=yes
ConfigEnd
Index: php3/php.h
diff -u php3/php.h:1.56 php3/php.h:1.57
--- php3/php.h:1.56 Mon Jun 28 12:57:41 1999
+++ php3/php.h Wed Jun 30 20:03:52 1999
@@ -28,7 +28,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php.h,v 1.56 1999/06/28 16:57:41 sas Exp $ */
+/* $Id: php.h,v 1.57 1999/07/01 00:03:52 sas Exp $ */
#ifndef _PHP_H
#define _PHP_H
@@ -136,6 +136,12 @@
* uncomment this.
* #define HAVE_ODBC (HAVE_IODBC|HAVE_SOLID)
*/
+
+#ifdef HAVE_FEATURES_H
+#undef _GNU_SOURCE
+#define _GNU_SOURCE
+#include <features.h>
+#endif
#include <stdlib.h>
#include <ctype.h>
-- PHP Development Mailing List (http://www.php.net/) To unsubscribe, e-mail: php-dev-unsubscribe <email protected> For additional commands, e-mail: php-dev-help <email protected> To contact the list administrators, e-mail: php-list-admin <email protected>
- Next message: sas: "[PHP-DEV] CVS update: php3/functions"
- Previous message: fleury.id <email protected>: "[PHP-DEV] Bug #1641: SYBASE float returns integer value in php script"
- Next in thread: sas: "[PHP-DEV] CVS update: php3"
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]