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

sas Sun Sep 26 16:17:28 1999 EDT Modified files: /php4 Makefile.in configure.in.in Log: Now thread safe version builds out of the box. libzend/TSRM contain extra config scripts which pass the necessary libs back to our Makefile. Index: php4/Makefile.in diff -u php4/Makefile.in:1.64 php4/Makefile.in:1.65 --- php4/Makefile.in:1.64 Sun Sep 26 15:26:53 1999 +++ php4/Makefile.in Sun Sep 26 16:17:27 1999 @@ -24,7 +24,7 @@ # +----------------------------------------------------------------------+ # -# $Id: Makefile.in,v 1.64 1999/09/26 19:26:53 sas Exp $ +# $Id: Makefile.in,v 1.65 1999/09/26 20:17:27 sas Exp $ # prefix = @prefix@ @@ -36,7 +36,8 @@ top_builddir = . ZEND_DIR = $(srcdir)/libzend -SUBDIRS=libzend ext @TSRM_DIR@ +TSRM_DIR = @TSRM_DIR@ +SUBDIRS=libzend ext $(TSRM_DIR) PACKAGE = @PACKAGE@ VERSION = @VERSION@ @@ -92,8 +93,8 @@ done && test -z "$$fail" # CGI binary or fhttpd module -php: all-recursive $(OBJS) @REGEX_LIB@ @FHTTPD_LIB@ @TSRM_LIB@ - $(CC) $(CFLAGS) -o $(BINNAME) $(LDFLAGS) $(OBJS) $(LIBS) @TSRM_LIBS@ +php: all-recursive $(OBJS) @REGEX_LIB@ @FHTTPD_LIB@ + $(CC) $(CFLAGS) -o $(BINNAME) $(LDFLAGS) $(OBJS) $(LIBS) # Apache modules libphp4.a libmodphp4.a: all-recursive $(OBJS) @REGEX_LIB@ @@ -115,8 +116,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 @TSRM_LIB@ - g++ $(LDFLAGS) -shared aolserver.o -o php4_aol.la libmodphp4-so.a $(LIBS) @TSRM_LIBS@ +php4_aol.so: libmodphp4-so.a + g++ $(LDFLAGS) -shared aolserver.o -o $@ libmodphp4-so.a $(LIBS) regex/libregex.a: (cd regex; $(MAKE) lib) Index: php4/configure.in.in diff -u php4/configure.in.in:1.93 php4/configure.in.in:1.94 --- php4/configure.in.in:1.93 Sun Sep 26 15:26:54 1999 +++ php4/configure.in.in Sun Sep 26 16:17:28 1999 @@ -1,4 +1,4 @@ -dnl $Id: configure.in.in,v 1.93 1999/09/26 19:26:54 sas Exp $ -*- sh -*- +dnl $Id: configure.in.in,v 1.94 1999/09/26 20:17:28 sas Exp $ -*- sh -*- dnl Process this file with autoconf to produce a configure script. divert(0) @@ -208,6 +208,7 @@ fi INCLUDES="-I\$(top_builddir)/libzend -I\$(top_builddir)/TSRM" +EXTRA_LIBS="$EXTRA_LIBS \\$(SHELL) ./libzend/zend_config --libs\" AC_SUBST(INCLUDES) AC_CHECK_LIB(nsl, gethostname, [ @@ -864,15 +865,14 @@ 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 + EXTRA_LIBS="$EXTRA_LIBS \$(TSRM_DIR)/libtsrm.a \\$(SHELL) \$(TSRM_DIR)/tsrm_config --libs\" AC_DEFINE(ZTS) ],[ TSRM_DIR="" ]) AC_SUBST(TSRM_DIR) AC_SUBST(TSRM_LIB) -AC_SUBST(TSRM_LIBS) AC_MSG_CHECKING(whether to enable runpaths) AC_ARG_ENABLE(rpath,