diff options
| author | Sascha Schumann <sas@php.net> | 1999-10-04 15:20:12 +0000 |
|---|---|---|
| committer | Sascha Schumann <sas@php.net> | 1999-10-04 15:20:12 +0000 |
| commit | 8ae3f4b027834c0ba4dd7724ae66eb0b4a6836d0 (patch) | |
| tree | 6b09f4e201cbcd5f68020107840ca3a937b5f15e /Zend/configure.in | |
| parent | 232afa4816c60a20d3db48c304ac59312d46ec46 (diff) | |
| download | php-git-8ae3f4b027834c0ba4dd7724ae66eb0b4a6836d0.tar.gz | |
Use libtool to build.
Diffstat (limited to 'Zend/configure.in')
| -rw-r--r-- | Zend/configure.in | 29 |
1 files changed, 12 insertions, 17 deletions
diff --git a/Zend/configure.in b/Zend/configure.in index 82d4fa347f..52e5879ebe 100644 --- a/Zend/configure.in +++ b/Zend/configure.in @@ -27,10 +27,13 @@ AC_PROG_CC if test "$enable_thread_safety" = "yes" ; then AC_PROG_CXX fi -AC_PROG_RANLIB AC_PROG_CC_C_O AM_PROG_LEX +AM_PROG_LIBTOOL +if test "$enable_debug" != "yes"; then + AM_SET_LIBTOOL_VARIABLE([--silent]) +fi AM_PROG_CC_STDC AC_C_INLINE @@ -131,30 +134,26 @@ AC_ARG_ENABLE(memory-limit, ]) +ZEND_SCANNER_TYPE=c dnl Sigh. This will probably break automake's automatic dependencies.. AC_MSG_CHECKING(whether to build Zend thread-safe) AC_ARG_ENABLE(thread-safety, [ --enable-thread-safety Whether to build Zend thread-safe.],[ if test "$enableval" = "yes"; then AC_DEFINE(ZTS) - ZEND_SCANNER_SRC=zend-scanner.cc - ZEND_SCANNER_COMPILE='$(CXXCOMPILE) -c $< -o $@' + ZEND_SCANNER_TYPE=cc CPPFLAGS="$CPPFLAGS -I../TSRM" AC_MSG_RESULT(yes) else - ZEND_SCANNER_SRC=zend-scanner.c - ZEND_SCANNER_COMPILE='$(COMPILE) -c $<' AC_MSG_RESULT(no) fi ],[ - ZEND_SCANNER_SRC=zend-scanner.c - ZEND_SCANNER_COMPILE='$(COMPILE) -c $<' AC_MSG_RESULT(no) ]) AC_SUBST(TSRM_DIR) AC_SUBST(TSRM_LIB) -AC_SUBST(ZEND_SCANNER_SRC) -AC_SUBST(ZEND_SCANNER_COMPILE) +ZEND_SCANNER="libzend_${ZEND_SCANNER_TYPE}.la" +AC_SUBST(ZEND_SCANNER) if test "$enable_thread_safety" = "yes" ; then AC_CHECK_LIB(C, cin) @@ -181,14 +180,10 @@ AC_LANG_RESTORE fi -AC_SUBST(CXXFLAGS) - -AC_SUBST(CFLAGS_SHLIB) -AC_SUBST(LDFLAGS_SHLIB) -AC_SUBST(LDFLAGS_SHLIB_EXPORT) - -AC_OUTPUT(Makefile zend_config) -AC_OUTPUT_COMMANDS([chmod +x zend_config]) +EXTRA_LIBS="$LIBS" +LIBS="" +AC_SUBST(EXTRA_LIBS) +AC_OUTPUT(Makefile) # Local Variables: # tab-width: 4 |