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

rasmus Tue Jul 27 10:30:55 1999 EDT Modified files: /php3 aclocal.m4 configure.in libphp3.module.in Log: Fix Apache helper programs linking problems Index: php3/aclocal.m4 diff -u php3/aclocal.m4:1.44 php3/aclocal.m4:1.45 --- php3/aclocal.m4:1.44 Wed Jun 30 20:03:52 1999 +++ php3/aclocal.m4 Tue Jul 27 10:30:53 1999 @@ -1,4 +1,4 @@ -dnl $Id: aclocal.m4,v 1.44 1999/07/01 00:03:52 sas Exp $ +dnl $Id: aclocal.m4,v 1.45 1999/07/27 14:30:53 rasmus Exp $ dnl dnl This file contains local autoconf functions. @@ -41,9 +41,8 @@ AC_EXPAND_PATH($1, ai_p) AC_PHP_ONCE(LIBPATH, $ai_p, [ EXTRA_LIBS="$EXTRA_LIBS -L$ai_p" - if test -n "$rpath_raw" ; then - RPATHS="$RPATHS ${raw_runpath_switch}$ai_p" - elif test -n "$APXS" ; then + RAW_RPATHS="$RAW_RPATHS ${raw_runpath_switch}$ai_p" + if test -n "$APXS" ; then RPATHS="$RPATHS ${apxs_runpath_switch}$ai_p'" else RPATHS="$RPATHS ${ld_runpath_switch}$ai_p" Index: php3/configure.in diff -u php3/configure.in:1.447 php3/configure.in:1.448 --- php3/configure.in:1.447 Mon Jul 26 14:41:20 1999 +++ php3/configure.in Tue Jul 27 10:30:53 1999 @@ -1,4 +1,4 @@ -dnl $Id: configure.in,v 1.447 1999/07/26 18:41:20 rasmus Exp $ +dnl $Id: configure.in,v 1.448 1999/07/27 14:30:53 rasmus Exp $ dnl Process this file with autoconf to produce a configure script. AC_INIT(main.c) @@ -2828,6 +2828,7 @@ 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/libphp3.module.in diff -u php3/libphp3.module.in:1.30 php3/libphp3.module.in:1.31 --- php3/libphp3.module.in:1.30 Thu Jul 1 08:04:05 1999 +++ php3/libphp3.module.in Tue Jul 27 10:30:54 1999 @@ -1,8 +1,8 @@ Name: php3_module ConfigStart RULE_WANTHSREGEX=@HSREGEX@ - LDFLAGS_SHLIB="@RPATHS@ $LDFLAGS_SHLIB" - LIBS="@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@" + 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