cvs: /php4 acinclude.m4 configure.in

sas Sun Dec 5 17:41:39 1999 EDT Modified files: /php4 acinclude.m4 configure.in Log: Add rpaths to LDFLAGS during configure, drop them later. Index: php4/acinclude.m4 diff -u php4/acinclude.m4:1.48 php4/acinclude.m4:1.49 --- php4/acinclude.m4:1.48 Sun Dec 5 11:24:20 1999 +++ php4/acinclude.m4 Sun Dec 5 17:41:08 1999 @@ -1,4 +1,4 @@ -dnl $Id: acinclude.m4,v 1.48 1999/12/05 16:24:20 sas Exp $ +dnl $Id: acinclude.m4,v 1.49 1999/12/05 22:41:08 sas Exp $ dnl dnl This file contains local autoconf functions. @@ -78,6 +78,7 @@ if test "$1" != "/usr/lib"; then AC_EXPAND_PATH($1, ai_p) AC_PHP_ONCE(LIBPATH, $ai_p, [ + test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" LDFLAGS="$LDFLAGS -L$ai_p" PHP_RPATHS="$PHP_RPATHS $ai_p" ]) Index: php4/configure.in diff -u php4/configure.in:1.59 php4/configure.in:1.60 --- php4/configure.in:1.59 Sun Dec 5 11:24:20 1999 +++ php4/configure.in Sun Dec 5 17:41:08 1999 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.59 1999/12/05 16:24:20 sas Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.60 1999/12/05 22:41:08 sas Exp $ -*- sh -*- dnl ## Process this file with autoconf to produce a configure script. divert(0) @@ -731,7 +731,6 @@ dnl add -fPIC option on Solaris if we are building dynamic extensions dnl PHP_SOLARIS_PIC_WEIRDNESS -AC_BUILD_RPATH phplibdir="pwd/modules" phptempdir="pwd/libs" @@ -739,8 +738,12 @@ AC_SUBST(phptempdir) EXTRA_LIBS="$EXTRA_LIBS $LIBS" LIBS="" -EXTRA_LDFLAGS="$EXTRA_LDFLAGS $LDFLAGS" +for i in $PHP_RPATHS; do + EXTRA_LDFLAGS="$EXTRA_LDFLAGS -L$i" +done LDFLAGS="" + +AC_BUILD_RPATH AC_SUBST(CFLAGS) AC_SUBST(PROG_SENDMAIL)