cvs: /php4 ltmain.sh ltconfig buildconf build.mk

sas Mon Nov 8 06:04:45 1999 EDT Modified files: /php4 ltmain.sh ltconfig buildconf build.mk Log: Add libtool files to CVS. Advantages: - PHP-specific changes are easier to maintain - it removes one dependency for users (i.e. GNU vs. FreeBSD ports) I have not removed the libtool check in buildconf, since libzend/TSRM still depend on a local version of libtool. Index: php4/buildconf diff -u php4/buildconf:1.42 php4/buildconf:1.43 --- php4/buildconf:1.42 Thu Nov 4 04:34:35 1999 +++ php4/buildconf Mon Nov 8 06:04:14 1999 @@ -114,11 +114,6 @@ ./scripts/preconfig -rm -f ltmain.sh ltconfig -libtoolize --automake --copy --force -patch ltconfig < patch-aa -patch ltmain.sh < patch-ab - mv aclocal.m4 aclocal.m4.old 2>/dev/null aclocal if test "$?" != "0" -a "$am_prefix" != "$lt_prefix"; then Index: php4/build.mk diff -u php4/build.mk:1.7 php4/build.mk:1.8 --- php4/build.mk:1.7 Sat Nov 6 08:05:14 1999 +++ php4/build.mk Mon Nov 8 06:04:14 1999 @@ -9,12 +9,8 @@ # # Written by Sascha Schumann # -# $Id: build.mk,v 1.7 1999/11/06 13:05:14 sas Exp $ +# $Id: build.mk,v 1.8 1999/11/08 11:04:14 sas Exp $ - -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) @@ -31,7 +27,7 @@ acconfig_h_SOURCES = acconfig.h.in $(config_h_files) -targets = $(makefile_in_files) $(LT_TARGETS) configure $(config_h_in) +targets = $(makefile_in_files) configure $(config_h_in) all: $(targets) @for i in $(SUBDIRS); do \ @@ -62,16 +58,6 @@ 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