diff options
| -rw-r--r-- | build.mk | 16 | ||||
| -rw-r--r-- | ext/pcre/config0.m4 | 64 |
2 files changed, 15 insertions, 65 deletions
@@ -11,6 +11,10 @@ # # $Id$ + +LT_TARGETS = ltmain.sh ltconfig +LT_PATCHES = patch-aa patch-ab + SUBDIRS = libzend TSRM makefile_am_files = Makefile.am $(shell find ext sapi regex -name Makefile.am) @@ -27,7 +31,7 @@ config_m4_files = \ acconfig_h_SOURCES = acconfig.h.in $(config_h_files) -targets = $(makefile_in_files) configure $(config_h_in) +targets = $(makefile_in_files) $(LT_TARGETS) configure $(config_h_in) all: $(targets) @for i in $(SUBDIRS); do \ @@ -59,6 +63,16 @@ acconfig.h: $(acconfig_h_SOURCES) @echo rebuilding $@ @cat $(acconfig_h_SOURCES) > $@ +$(LT_TARGETS): $(LT_PATCHES) + rm -f $(LT_TARGETS) + libtoolize --automake -c -f + patch ltconfig < patch-aa + patch ltmain.sh < patch-ab + @grep compile_rpath ltconfig >/dev/null 2>&1 || (\ + echo "patching libtool components failed."; \ + exit 1) + + $(makefile_in_files): $(makefile_am_files) aclocal.m4 @echo rebuilding Makefile.in\'s @automake -a -i $(AMFLAGS) $(makefile_files) 2>&1 \ diff --git a/ext/pcre/config0.m4 b/ext/pcre/config0.m4 deleted file mode 100644 index 729e99e52d..0000000000 --- a/ext/pcre/config0.m4 +++ /dev/null @@ -1,64 +0,0 @@ -dnl $Id$ -dnl config.m4 for extension pcre - -dnl By default we'll compile and link against the bundled PCRE library -dnl if DIR is supplied, we'll use that for linking - -AC_MSG_CHECKING(whether to include PCRE support) -AC_ARG_WITH(pcre-regex, -[ --without-pcre-regex Do not include Perl Compatible Regular Expressions - support. Use --with-pcre-regex=DIR to specify DIR - where PCRE's include and library files are located, - if not using bundled library.], -[ - case "$withval" in - no) - AC_MSG_RESULT(no) - ;; - yes) - EXTRA_LIBS="-L$abs_builddir/ext/pcre/pcrelib -lpcre $EXTRA_LIBS" - PCRE_SUBDIR="pcrelib" - AC_DEFINE(HAVE_BUNDLED_PCRE, 1) - AC_MSG_RESULT(yes) - PHP_EXTENSION(pcre) - PHP_OUTPUT(ext/pcre/pcrelib/Makefile) - ;; - *) - if test -f $withval/pcre.h ; then - changequote({,}) - pcre_major=`grep PCRE_MAJOR $withval/pcre.h | sed -e 's/[^0-9]//g'` - pcre_minor=`grep PCRE_MINOR $withval/pcre.h | sed -e 's/[^0-9]//g'` - changequote([,]) - pcre_version=$pcre_major$pcre_minor - if test "$pcre_version" -ge 208; then - AC_ADD_INCLUDE($withval) - else - AC_MSG_ERROR(PCRE extension requires PCRE library version >= 2.08) - fi - else - AC_MSG_ERROR(Could not find pcre.h in $withval) - fi - - if test -f $withval/libpcre.a ; then - AC_ADD_LIBRARY_WITH_PATH(pcre, $withval) - else - AC_MSG_ERROR(Could not find libpcre.a in $withval) - fi - - AC_DEFINE(HAVE_PCRE, 1) - AC_MSG_RESULT(yes) - PHP_EXTENSION(pcre) - ;; - esac -],[ - PCRE_LIBADD=pcrelib/libpcre.la - PCRE_SUBDIRS=pcrelib - AC_DEFINE(HAVE_BUNDLED_PCRE, 1) - AC_MSG_RESULT(yes) - PHP_EXTENSION(pcre) - PHP_OUTPUT(ext/pcre/pcrelib/Makefile) -]) -AC_SUBST(PCRE_LIBADD) -AC_SUBST(PCRE_SUBDIRS) - -AC_CHECK_FUNC(memmove, [], [AC_DEFINE(USE_BCOPY, 1)]) |