Now thread safe version builds out of the box. libzend/TSRM

    contain extra config scripts which pass the necessary libs back
    to our Makefile.

diff --git a/Makefile.in b/Makefile.in
index 6991a8e8aa8cd89c3acc06557edcb07bb3431f53..4996baa3ec4cdec7d0dfdc7b3fa1405cc706e2e5 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -36,7 +36,8 @@ bindir = @bindir@
 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 @@ maintainer-clean-depend-recursive:
        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 @@ libphp4.so: $(srcdir)/mod_php4.c libmodphp4-so.a @REGEX_LIB@
        -@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)

diff --git a/configure.in.in b/configure.in.in
index 62807fd9b7bd2ee9d1b57b09cd25974989fc960e..82e30ae8899a98ee6dcf24e614be422e59f14f16 100644 (file)
--- a/configure.in.in
+++ b/configure.in.in
@@ -208,6 +208,7 @@ if test -d /usr/pkg/include -a -d /usr/pkg/lib ; then
 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_MSG_CHECKING(whether to build PHP thread-safe)
 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,