cvs: /php3 ChangeLog configure.in aclocal.m4 libphp3.module.in

sas Wed Aug 25 12:11:42 1999 EDT Modified files: /php3 ChangeLog configure.in aclocal.m4 libphp3.module.in Log: get rid of LDFLAGS_SHLIB and --with-shared-apache which depends on that Index: php3/ChangeLog diff -u php3/ChangeLog:1.744 php3/ChangeLog:1.745 --- php3/ChangeLog:1.744 Sat Aug 21 13:41:01 1999 +++ php3/ChangeLog Wed Aug 25 12:11:41 1999 @@ -2,6 +2,7 @@ ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ???? ??, 1999, Version 3.0.13 +- Removed --with-shared-apache to avoid problems with Apache 1.3.9 (Sascha) - Improved speed of uniqid() by using the combined LCG and removing the extra usleep() (Sascha) - Introduced general combined linear congruential generator (Sascha) Index: php3/configure.in diff -u php3/configure.in:1.453 php3/configure.in:1.454 --- php3/configure.in:1.453 Sat Aug 21 14:16:07 1999 +++ php3/configure.in Wed Aug 25 12:11:41 1999 @@ -1,4 +1,4 @@ -dnl $Id: configure.in,v 1.453 1999/08/21 18:16:07 sas Exp $ +dnl $Id: configure.in,v 1.454 1999/08/25 16:11:41 sas Exp $ dnl Process this file with autoconf to produce a configure script. AC_INIT(main.c) @@ -69,7 +69,6 @@ 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,[ @@ -81,12 +80,10 @@ 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 @@ -311,60 +308,6 @@ APXS_CC="$APXS -q CC" fi -AC_MSG_CHECKING(for Apache module support via DSO through APACI) -AC_ARG_WITH(shared-apache, -[ --with-shared-apache[=DIR] Build shared Apache module. DIR is the top-level - Apache build directory, defaults to /usr/local/etc/httpd. - (This option needs Perl installed)], -[ - if test "$withval" = "yes"; then - # Apache's default directory - withval=/usr/local/etc/httpd - fi - if test "$withval" != "no"; then - rpath_raw=yes -# figure out extra library nonsense - 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 - if test ! -d $APACHE_TARGET; then - mkdir $APACHE_TARGET - fi - 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 - 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) - AC_MSG_RESULT(yes - Shared Apache 1.3.x) - STRONGHOLD= - if test -f $withval/src/include/ap_config.h; then - AC_DEFINE(HAVE_AP_CONFIG_H) - fi - if test -f $withval/src/include/ap_compat.h; then - AC_DEFINE(HAVE_AP_COMPAT_H) - if test ! -f $withval/src/include/ap_config_auto.h; then - AC_MSG_ERROR(Please run Apache's configure or src/Configure program once and try again) - fi - else - if test -f $withval/src/include/compat.h; then - AC_DEFINE(HAVE_OLD_COMPAT_H) - fi - fi - else - AC_MSG_RESULT(no) - AC_MSG_ERROR(Invalid Apache directory - unable to find httpd.h under $withval/src/include) - fi - fi - AC_SUBST(APACHE_INCLUDE) - AC_SUBST(APACHE_TARGET) - AC_SUBST(INSTALL_IT) - AC_SUBST(BINNAME) - AC_SUBST(PHP_LIBS) -],[ - AC_MSG_RESULT(no) -]) - if test "$BINNAME" != "libmodphp3-so.a"; then if test "$BINNAME" != "libphp3.so"; then AC_MSG_CHECKING(for Apache module support) @@ -377,7 +320,6 @@ withval=/usr/local/etc/httpd fi if test "$withval" != "no"; then - rpath_raw=yes # figure out extra library nonsense # For Apache 1.2.x if test -f $withval/src/httpd.h; then @@ -2904,7 +2846,6 @@ AC_SUBST(INCLUDES) AC_SUBST(EXTRA_LIBS) AC_SUBST(RPATHS) -AC_SUBST(RAW_RPATHS) dnl Create the necessary directories if building using VPATH if test ! -d functions; then Index: php3/aclocal.m4 diff -u php3/aclocal.m4:1.45 php3/aclocal.m4:1.46 --- php3/aclocal.m4:1.45 Tue Jul 27 10:30:53 1999 +++ php3/aclocal.m4 Wed Aug 25 12:11:42 1999 @@ -1,4 +1,4 @@ -dnl $Id: aclocal.m4,v 1.45 1999/07/27 14:30:53 rasmus Exp $ +dnl $Id: aclocal.m4,v 1.46 1999/08/25 16:11:42 sas Exp $ dnl dnl This file contains local autoconf functions. @@ -41,7 +41,6 @@ AC_EXPAND_PATH($1, ai_p) AC_PHP_ONCE(LIBPATH, $ai_p, [ EXTRA_LIBS="$EXTRA_LIBS -L$ai_p" - RAW_RPATHS="$RAW_RPATHS ${raw_runpath_switch}$ai_p" if test -n "$APXS" ; then RPATHS="$RPATHS ${apxs_runpath_switch}$ai_p'" else Index: php3/libphp3.module.in diff -u php3/libphp3.module.in:1.31 php3/libphp3.module.in:1.32 --- php3/libphp3.module.in:1.31 Tue Jul 27 10:30:54 1999 +++ php3/libphp3.module.in Wed Aug 25 12:11:42 1999 @@ -1,7 +1,6 @@ Name: php3_module ConfigStart RULE_WANTHSREGEX=@HSREGEX@ - LDFLAGS_SHLIB="@RAW_RPATHS@ $LDFLAGS_SHLIB" LIBS="@RPATHS@ @EXTRA_LIBS@ @PHP_LIBS@ @ORACLE_LFLAGS@ @ORACLE_LIBS@ @IODBC_LFLAGS@ @IODBC_LIBS@ @OPENLINK_LFLAGS@ @OPENLINK_LIBS@ @SYBASE_LFLAGS@ @SYBASE_LIBS@ @SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@ @ADA_LFLAGS@ @ADA_LIBS@ @SOLID_LIBS@ @VELOCIS_LIBS@ @ZLIB_LIBS@ @CODBC_LFLAGS@ @CODBC_LIBS@ @IFX_LFLAGS@ @IFX_LIBS@ @IBASE_LFLAGS@ @IBASE_LIBS@ @PDFLIB_LIBS@ @LIBS@ $LIBS @DBM_LIB@" RULE_HIDE=yes ConfigEnd