cvs: /php4 Makefile.in configure.in.in

gorgo Wed Sep 8 10:32:00 1999 EDT Modified files: /php4 Makefile.in configure.in.in Log: remove -Wl,--version-script from RPATHS, put it into a separate variable Index: php4/Makefile.in diff -u php4/Makefile.in:1.53 php4/Makefile.in:1.54 --- php4/Makefile.in:1.53 Tue Aug 31 11:42:12 1999 +++ php4/Makefile.in Wed Sep 8 10:31:56 1999 @@ -24,12 +24,13 @@ # +----------------------------------------------------------------------+ # -# $Id: Makefile.in,v 1.53 1999/08/31 15:42:12 thies Exp $ +# $Id: Makefile.in,v 1.54 1999/09/08 14:31:56 gorgo Exp $ # prefix = @prefix@ exec_prefix = @exec_prefix@ srcdir = @srcdir@ +abs_srcdir = @abs_srcdir@ VPATH = @srcdir@ bindir = @bindir@ @@ -57,7 +58,7 @@ DEFS = @DEFS@ CFLAGS = @CFLAGS@ @DEBUG_CFLAGS@ $(PROF_CFLAGS) COMPILE = $(CC) $(CFLAGS) $(CFLAGS_SHLIB) $(CPPFLAGS) $(INCLUDE) $(DEFS) @STRONGHOLD@ -LDFLAGS = @RPATHS@ @LDFLAGS@ $(LDFLAGS_SHLIB) $(LDFLAGS_SHLIB_EXPORT) -L$(ZEND_DIR) +LDFLAGS = @VERSION_SCRIPT@ @RPATHS@ @LDFLAGS@ $(LDFLAGS_SHLIB) $(LDFLAGS_SHLIB_EXPORT) -L$(ZEND_DIR) REGCFLAGS = $(CFLAGS) RANLIB = @RANLIB@ YACC = @YACC@ @@ -114,7 +115,7 @@ libphp4.so: $(srcdir)/mod_php4.c libmodphp4-so.a @REGEX_LIB@ -@test -f ./mod_php4.c || test -L ./mod_php4.c || $(LN_S) $(srcdir)/mod_php4.c ./mod_php4.c -@test -f ./mod_php4.c || test -h ./mod_php4.c || $(LN_S) $(srcdir)/mod_php4.c ./mod_php4.c - $(APXS) $(INCLUDE) -c -o libphp4.so @RPATHS@ ./mod_php4.c libmodphp4-so.a $(APXS_LDFLAGS) $(APXS_EXP) + $(APXS) $(INCLUDE) -c -o libphp4.so @VERSION_SCRIPT@ @RPATHS@ ./mod_php4.c libmodphp4-so.a $(APXS_LDFLAGS) $(APXS_EXP) regex/libregex.a: (cd regex; $(MAKE) lib) Index: php4/configure.in.in diff -u php4/configure.in.in:1.70 php4/configure.in.in:1.71 --- php4/configure.in.in:1.70 Wed Sep 8 08:26:31 1999 +++ php4/configure.in.in Wed Sep 8 10:31:57 1999 @@ -1,4 +1,4 @@ -dnl $Id: configure.in.in,v 1.70 1999/09/08 12:26:31 sas Exp $ -*- sh -*- +dnl $Id: configure.in.in,v 1.71 1999/09/08 14:31:57 gorgo Exp $ -*- sh -*- dnl Process this file with autoconf to produce a configure script. divert(0) @@ -382,9 +382,10 @@ [ --enable-versioning], [ if test "$enableval" = "yes" ; then - RPATHS="-Wl,--version-script=\$(srcdir)/php.map $RPATHS" + VERSION_SCRIPT="-Wl,--version-script=\$(abs_srcdir)/php.map" fi ]) +AC_SUBST(VERSION_SCRIPT) APACHE_INSTALL_FILES="$srcdir/mod_php4.* libphp4.module"