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

sas Sun Sep 26 15:26:54 1999 EDT Modified files: /php4 Makefile.in configure.in.in Log: Use new tsrm_config script to determine libraries. Index: php4/Makefile.in diff -u php4/Makefile.in:1.63 php4/Makefile.in:1.64 --- php4/Makefile.in:1.63 Fri Sep 24 20:32:25 1999 +++ php4/Makefile.in Sun Sep 26 15:26:53 1999 @@ -24,7 +24,7 @@ # +----------------------------------------------------------------------+ # -# $Id: Makefile.in,v 1.63 1999/09/25 00:32:25 sas Exp $ +# $Id: Makefile.in,v 1.64 1999/09/26 19:26:53 sas Exp $ # prefix = @prefix@ @@ -93,7 +93,7 @@ # CGI binary or fhttpd module php: all-recursive $(OBJS) @REGEX_LIB@ @FHTTPD_LIB@ @TSRM_LIB@ - $(CC) $(CFLAGS) -o $(BINNAME) $(LDFLAGS) $(OBJS) $(LIBS) @TSRM_LIB@ + $(CC) $(CFLAGS) -o $(BINNAME) $(LDFLAGS) $(OBJS) $(LIBS) @TSRM_LIBS@ # Apache modules libphp4.a libmodphp4.a: all-recursive $(OBJS) @REGEX_LIB@ @@ -115,8 +115,8 @@ -@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 @VERSION_SCRIPT@ @RPATHS@ ./mod_php4.c libmodphp4-so.a $(APXS_LDFLAGS) $(APXS_EXP) -php4_aol.so: libmodphp4-so.a - g++ $(LDFLAGS) aolserver.o -rdynamic -shared -o $@ libmodphp4-so.a $(LIBS) @TSRM_LIB@ +php4_aol.so: libmodphp4-so.a @TSRM_LIB@ + g++ $(LDFLAGS) -shared aolserver.o -o php4_aol.la libmodphp4-so.a $(LIBS) @TSRM_LIBS@ regex/libregex.a: (cd regex; $(MAKE) lib) Index: php4/configure.in.in diff -u php4/configure.in.in:1.92 php4/configure.in.in:1.93 --- php4/configure.in.in:1.92 Sun Sep 26 12:27:25 1999 +++ php4/configure.in.in Sun Sep 26 15:26:54 1999 @@ -1,4 +1,4 @@ -dnl $Id: configure.in.in,v 1.92 1999/09/26 16:27:25 ssb Exp $ -*- sh -*- +dnl $Id: configure.in.in,v 1.93 1999/09/26 19:26:54 sas Exp $ -*- sh -*- dnl Process this file with autoconf to produce a configure script. divert(0) @@ -864,6 +864,7 @@ AC_ARG_ENABLE(thread-safety, [ --enable-thread-safety Whether to build PHP thread-safe.],[ TSRM_LIB='TSRM/libtsrm.a' + TSRM_LIBS='TSRM/libtsrm.a TSRM/tsrm_config --libs' TSRM_DIR=TSRM AC_DEFINE(ZTS) ],[ @@ -871,6 +872,7 @@ ]) AC_SUBST(TSRM_DIR) AC_SUBST(TSRM_LIB) +AC_SUBST(TSRM_LIBS) AC_MSG_CHECKING(whether to enable runpaths) AC_ARG_ENABLE(rpath,