cvs: /php4 acinclude.m4 configure.in.in ChangeLog

sas Sun Sep 26 05:05:56 1999 EDT Modified files: /php4 acinclude.m4 configure.in.in ChangeLog Log: Disable rpaths optionally. Index: php4/acinclude.m4 diff -u php4/acinclude.m4:1.28 php4/acinclude.m4:1.29 --- php4/acinclude.m4:1.28 Thu Sep 16 04:26:46 1999 +++ php4/acinclude.m4 Sun Sep 26 05:05:56 1999 @@ -1,4 +1,4 @@ -dnl $Id: acinclude.m4,v 1.28 1999/09/16 08:26:46 sas Exp $ +dnl $Id: acinclude.m4,v 1.29 1999/09/26 09:05:56 sas Exp $ dnl dnl This file contains local autoconf functions. @@ -38,12 +38,27 @@ AC_EXPAND_PATH($1, ai_p) AC_PHP_ONCE(LIBPATH, $ai_p, [ EXTRA_LIBS="$EXTRA_LIBS -L$ai_p" - if test -n "$APXS" ; then - RPATHS="$RPATHS ${apxs_runpath_switch}$ai_p'" + PHP_RPATHS="$PHP_RPATHS $ai_p" + ]) +]) + +dnl +dnl AC_BUILD_RPATH() +dnl +dnl builds RPATH from PHP_RPATHS +dnl +AC_DEFUN(AC_BUILD_RPATH,[ + if test "$enable_rpath" = "yes"; then + if test -n "$AXPS"; then + for i in $PHP_RPATHS; do + RPATHS="$RPATHS ${apxs_runpath_switch}$i'" + done else - RPATHS="$RPATHS ${ld_runpath_switch}$ai_p" + for i in $PHP_RPATHS; do + RPATHS="$RPATHS ${ld_runpath_switch}$i" + done fi - ]) + fi ]) dnl Index: php4/configure.in.in diff -u php4/configure.in.in:1.90 php4/configure.in.in:1.91 --- php4/configure.in.in:1.90 Fri Sep 24 20:32:25 1999 +++ php4/configure.in.in Sun Sep 26 05:05:56 1999 @@ -1,4 +1,4 @@ -dnl $Id: configure.in.in,v 1.90 1999/09/25 00:32:25 sas Exp $ -*- sh -*- +dnl $Id: configure.in.in,v 1.91 1999/09/26 09:05:56 sas Exp $ -*- sh -*- dnl Process this file with autoconf to produce a configure script. divert(0) @@ -638,7 +638,6 @@ AC_DEFINE(HAVE_AOLSERVER) BINNAME=php4_aol.so INSTALL_IT="\$(SHELL) \$(srcdir)/install-sh -m 0755 $BINNAME $NS_DIR/root/bin/$BINNAME" - CFLAGS="$CFLAGS -rdynamic" RESULT=yes ]) AC_MSG_RESULT($RESULT) @@ -873,6 +872,21 @@ AC_SUBST(TSRM_DIR) AC_SUBST(TSRM_LIB) +AC_MSG_CHECKING(whether to enable runpaths) +AC_ARG_ENABLE(rpath, +[ --disable-rpath Disable passing additional runtime library + search paths], +[ + if test "$enableval" = "no"; then + enable_rpath=no + else + enable_rpath=yes + fi +],[ + enable_rpath=yes +]) +AC_MSG_RESULT($enable_rpath) + dnl AC_MSG_CHECKING(whether to enable PHP RPC support) dnl AC_ARG_ENABLE(php-rpc, dnl [ --enable-php-rpc Compile with PHP RPC support.], @@ -1003,6 +1017,8 @@ dnl add -fPIC option on Solaris if we are building dynamic extensions PHP_SOLARIS_PIC_WEIRDNESS + +AC_BUILD_RPATH AC_SUBST(CFLAGS) AC_SUBST(PROG_SENDMAIL) Index: php4/ChangeLog diff -u php4/ChangeLog:1.148 php4/ChangeLog:1.149 --- php4/ChangeLog:1.148 Sat Sep 25 17:08:36 1999 +++ php4/ChangeLog Sun Sep 26 05:05:56 1999 @@ -2,6 +2,7 @@ ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ?? ?? 1999, Version 4.0 Beta 3 +- Added '--disable-rpath' option (Sascha) - Added AOLserver SAPI module (Sascha) - Fixed XML Callbacks. (Thies) - Updated ODBC to use the new high-performance Zend function API (kara)