diff options
| author | Sascha Schumann <sas@php.net> | 1999-09-26 19:26:54 +0000 |
|---|---|---|
| committer | Sascha Schumann <sas@php.net> | 1999-09-26 19:26:54 +0000 |
| commit | 806abdb87c8983caabf496777ba43d5b0434952e (patch) | |
| tree | 384d0103dcbc59bc0ed4d24d6ac7bd32c082ecfd | |
| parent | 17df2892bd0933eb27013a22ef1a7a0a6e95aaaa (diff) | |
| download | php-git-806abdb87c8983caabf496777ba43d5b0434952e.tar.gz | |
Use new tsrm_config script to determine libraries.
| -rw-r--r-- | Makefile.in | 6 | ||||
| -rw-r--r-- | configure.in.in | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/Makefile.in b/Makefile.in index a5b2c0a582..6991a8e8aa 100644 --- a/Makefile.in +++ b/Makefile.in @@ -93,7 +93,7 @@ maintainer-clean-depend-recursive: # 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 @@ 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 - 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) diff --git a/configure.in.in b/configure.in.in index 87de98e548..62807fd9b7 100644 --- a/configure.in.in +++ b/configure.in.in @@ -864,6 +864,7 @@ 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 AC_DEFINE(ZTS) ],[ @@ -871,6 +872,7 @@ AC_ARG_ENABLE(thread-safety, ]) AC_SUBST(TSRM_DIR) AC_SUBST(TSRM_LIB) +AC_SUBST(TSRM_LIBS) AC_MSG_CHECKING(whether to enable runpaths) AC_ARG_ENABLE(rpath, |