Use libtool to build.

diff --git a/Zend/Makefile.am b/Zend/Makefile.am
index a66f8a07dd4c0537a887bed3fbb5de1155636e8b..005f39d50fc053f389dcce601ed5fc286b5e4b52 100644 (file)
--- a/Zend/Makefile.am
+++ b/Zend/Makefile.am
@@ -2,30 +2,33 @@
 
 #CLEANFILES = zend-parser.c zend-parser.h zend-scanner.c zend-parser.output 
 
+ZEND_SCANNER = @ZEND_SCANNER@
+
 AUTOMAKE_OPTIONS=foreign
-noinst_LIBRARIES=libzend.a
-libzend_a_SOURCES=\
-       zend-parser.y zend-scanner.l \
+EXTRA_LTLIBRARIES=libzend_cc.la libzend_c.la
+noinst_LTLIBRARIES=$(ZEND_SCANNER) libzend.la
+
+libzend_cc_la_SOURCES=zend-scanner-cc.cc
+libzend_c_la_SOURCES=zend-scanner.c
+
+libzend_la_SOURCES=\
+       zend-parser.y \
        zend_alloc.c zend_compile.c zend_constants.c \
        zend_execute.c zend_execute_API.c zend_highlight.c zend_llist.c \
        zend_opcode.c zend_operators.c zend_ptr_stack.c zend_stack.c \
        zend_variables.c zend.c zend_API.c zend_extensions.c zend_hash.c \
        zend_list.c zend_indent.c zend_builtin_functions.c
 
-# taken from automake 1.4
-CXXFLAGS= @CXXFLAGS@
-CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-
+libzend_la_LIBADD = $(ZEND_SCANNER)
+libzend_la_LDFLAGS = @EXTRA_LIBS@
+       
 # automake isn't too clever about "non-standard" use of lex and yacc
 
-zend-scanner.o: @ZEND_SCANNER_SRC@
-       @ZEND_SCANNER_COMPILE@
-
 zend-scanner.c: zend-scanner.l
-       $(LEX) -Pzend -ozend-scanner.c -i $(srcdir)/zend-scanner.l
+       $(LEX) -Pzend -o$@ -i $<
 
-zend-scanner.cc: zend-scanner.l
-       $(LEX) -+ -B -i -S$(srcdir)/flex.skl -Pzend -ozend-scanner.cc $(srcdir)/zend-scanner.l
+zend-scanner-cc.cc: zend-scanner.l
+       $(LEX) -+ -B -i -S$(srcdir)/flex.skl -Pzend -o$@ $<
 
 zend-parser.h: zend-parser.c
 zend-parser.c: zend-parser.y

diff --git a/Zend/acconfig.h b/Zend/acconfig.h
index 9a5e3a5c0d40f722fb8b06e9d3a5d90a124da038..97f2e23cdbd0fc1dc67e1dc7b48b3c29dfc6783e 100644 (file)
--- a/Zend/acconfig.h
+++ b/Zend/acconfig.h
@@ -80,10 +80,6 @@ int zend_sprintf(char *buffer, const char *format, ...);
 # define zend_sprintf sprintf
 #endif
 
-#if ZEND_DEBUG
-# define inline
-#endif
-
 /*
  * Local variables:
  * tab-width: 4

diff --git a/Zend/acinclude.m4 b/Zend/acinclude.m4
index f8a1eb75d87528e0b2bdc8ceda1b4d0155b917c9..3202fc7207b293a6c7e222e7227e2df82de262b2 100644 (file)
--- a/Zend/acinclude.m4
+++ b/Zend/acinclude.m4
@@ -18,3 +18,8 @@ AC_DEFUN(AC_ZEND_BROKEN_SPRINTF,[
     AC_MSG_RESULT(cannot check, guessing ok)
   ])
 ])
+
+AC_DEFUN(AM_SET_LIBTOOL_VARIABLE,[
+  LIBTOOL='$(SHELL) $(top_builddir)/libtool $1'
+])
+

diff --git a/Zend/buildconf b/Zend/buildconf
index deb6aedb7975bdf431702b0db888a18bff3e19d9..fe8dee6f767808868807a44b5766a167ddacabbf 100755 (executable)
--- a/Zend/buildconf
+++ b/Zend/buildconf
@@ -1,5 +1,14 @@
 #!/bin/sh
 
+case "$1" in
+--copy)
+       automake_flags=--copy
+       shift
+;;
+esac
+
+libtoolize --force --automake $automake_flags
+
 mv aclocal.m4 aclocal.m4.old 2>/dev/null
 aclocal
 if cmp aclocal.m4.old aclocal.m4 > /dev/null 2>&1; then
@@ -11,7 +20,7 @@ fi
 
 autoheader
 
-automake --add-missing --include-deps
+automake --add-missing --include-deps $automake_flags
 
 mv configure configure.old 2>/dev/null
 autoconf

diff --git a/Zend/configure.in b/Zend/configure.in
index 82d4fa347f33c9e51422c5cfd002b09bebea142b..52e5879ebeeebc8f9da4beaae700b3cda3947fc8 100644 (file)
--- 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

diff --git a/Zend/zend_config.in b/Zend/zend_config.in
deleted file mode 100755 (executable)
index c80000c..0000000
--- a/Zend/zend_config.in
+++ /dev/null
@@ -1,43 +0,0 @@
-#! /bin/sh
-#
-# $Id$
-#
-# Written by Sascha Schumann <sascha@schumann.cx>
-
-
-# taken from autoconf
-
-if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
-  # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
-  if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
-    ac_n= ac_c='
-' ac_t='    '
-  else
-    ac_n=-n ac_c= ac_t=
-  fi
-else
-  ac_n= ac_c='\c' ac_t=
-fi
-
-
-flags_libs="@LIBS@"
-flags_ldflags="@LDFLAGS@"
-flags_cflags="@CPPFLAGS@ @CFLAGS@"
-
-case "$1" in
---ldflags)
-       echo $ac_n "$flags_ldflags$ac_c"
-;;
---cflags)
-       echo $ac_n "$flags_cflags$ac_c"
-;;
---libs)
-       echo $ac_n "$flags_libs$ac_c"
-;;
-*)
-       echo "$0 [--libs|--cflags|--ldflags]"
-       exit 1
-;;
-esac
-
-exit 0