cvs: php4 / configure.in /build rules_common.mk /ext/satellite corba.c php_orbit.c

sas Sat May 12 05:22:34 2001 EDT Modified files: /php4 configure.in /php4/build rules_common.mk /php4/ext/satellite corba.c php_orbit.c Log: First step towards full libtool 1.4 portability Index: php4/configure.in diff -u php4/configure.in:1.249 php4/configure.in:1.250 --- php4/configure.in:1.249 Sat May 12 04:19:46 2001 +++ php4/configure.in Sat May 12 05:22:33 2001 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.249 2001/05/12 11:19:46 sas Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.250 2001/05/12 12:22:33 sas Exp $ -*- sh -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -594,10 +594,6 @@ fi -PHP_ARG_ENABLE(pic,whether to enable PIC for shared objects, -[ --disable-pic Disable PIC for shared objects], yes) - - PHP_ARG_ENABLE(dmalloc,whether to enable dmalloc, [ --enable-dmalloc Enable dmalloc]) @@ -652,18 +648,22 @@ enable_shared=yes enable_static=yes +unset with_pic case $php_build_target in -program) - enable_shared=no +program|static) + standard_libtool_flag='-prefer-non-pic -static' + if test "$lib_build_shared" != "yes"; then + enable_shared=no + fi + PHP_COMPILE='$(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) -c $< && touch $@' + CXX_PHP_COMPILE='$(CXX) $(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) -c $< && touch $@' ;; shared) enable_static=no + standard_libtool_flag=-prefer-pic EXTRA_LDFLAGS="$EXTRA_LDFLAGS -avoid-version" ;; -static) - enable_shared=no -;; esac if test "$PHP_SAPI" = "cgi"; then @@ -822,11 +822,13 @@ PHP_SUBST(AWK) PHP_SUBST(CC) PHP_SUBST(CFLAGS) +PHP_SUBST(CFLAGS_CLEAN) PHP_SUBST_OLD(CONFIGURE_COMMAND) PHP_SUBST(CPP) PHP_SUBST(CPPFLAGS) PHP_SUBST(CXX) PHP_SUBST(CXXFLAGS) +PHP_SUBST(CXXFLAGS_CLEAN) PHP_SUBST(CXX_PHP_COMPILE) PHP_SUBST_OLD(DEBUG_CFLAGS) PHP_SUBST(DEFS) @@ -886,38 +888,20 @@ AM_SET_LIBTOOL_VARIABLE([--silent]) fi -PHP_COMPILE='$(LIBTOOL) --mode=compile $(COMPILE) -c $<' -CXX_PHP_COMPILE='$(LIBTOOL) --mode=compile $(CXX_COMPILE) -c $<' -if test "$enable_shared" = "yes"; then - SHARED_LIBTOOL='$(LIBTOOL)' -else - if test "$lib_build_shared" = "yes"; then - PHP_CONFIGURE_PART(Configuring shared libtool) -dnl XXX This needs to be fixed -# $SHELL $srcdir/ltconfig --output=shlibtool --disable-static --srcdir=$srcdir --cache-file=./config.cache $srcdir/ltmain.sh - SHARED_LIBTOOL='$(SHELL) $(top_builddir)/shlibtool' - else - PHP_COMPILE='$(COMPILE) -c $< && touch $@' - CXX_PHP_COMPILE='$(CXX_COMPILE) -c $< && touch $@' - fi -fi +test -z "$PHP_COMPILE" && PHP_COMPILE='$(LIBTOOL) --mode=compile $(COMPILE) -c $<' +test -z "$CXX_PHP_COMPILE" && CXX_PHP_COMPILE='$(LIBTOOL) --mode=compile $(CXX_COMPILE) -c $<' +SHARED_LIBTOOL='$(LIBTOOL)' CC=$old_CC -changequote({,}) -if test "$PHP_PIC" = "no"; then - cat >meta_cc<<EOF -#! /bin/sh -cmd="$CC \echo \$@|sed s/-[fFD]PIC//g\" -exec \$cmd -EOF - chmod +x meta_cc - CC="$abs_builddir/meta_cc" -fi -changequote([,]) - PHP_CONFIGURE_PART(Generating files) + +CXXFLAGS_CLEAN=$CXXFLAGS +CFLAGS_CLEAN=$CFLAGS +CFLAGS="$CFLAGS $standard_libtool_flag" +INLINE_CFLAGS="$INLINE_CFLAGS $standard_libtool_flag" +CXXFLAGS="$CXXFLAGS $standard_libtool_flag" PHP_GEN_CONFIG_VARS Index: php4/build/rules_common.mk diff -u php4/build/rules_common.mk:1.5 php4/build/rules_common.mk:1.6 --- php4/build/rules_common.mk:1.5 Mon Nov 27 17:20:21 2000 +++ php4/build/rules_common.mk Sat May 12 05:22:33 2001 @@ -14,7 +14,7 @@ # | Authors: Sascha Schumann <sascha@schumann.cx> | # +----------------------------------------------------------------------+ # -# $Id: rules_common.mk,v 1.5 2000/11/28 01:20:21 sas Exp $ +# $Id: rules_common.mk,v 1.6 2001/05/12 12:22:33 sas Exp $ # include $(top_builddir)/config_vars.mk @@ -23,8 +23,8 @@ COMPILE = $(CC) $(COMMON_FLAGS) $(CFLAGS) $(EXTRA_CFLAGS) CXX_COMPILE = $(CXX) $(COMMON_FLAGS) $(CXXFLAGS) $(EXTRA_CXXFLAGS) -SHARED_COMPILE = $(SHARED_LIBTOOL) --mode=compile $(COMPILE) -c $< && touch $@ -CXX_SHARED_COMPILE = $(SHARED_LIBTOOL) --mode=compile $(CXX_COMPILE) -c $< && touch $@ +SHARED_COMPILE = $(SHARED_LIBTOOL) --mode=compile $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) -prefer-pic $(EXTRA_CFLAGS) -c $< && touch $@ +CXX_SHARED_COMPILE = $(SHARED_LIBTOOL) --mode=compile $(CXX) $(COMMON_FLAGS) $(CXXFLAGS_CLEAN) -prefer-pic $(EXTRA_CXXFLAGS) -c $< && touch $@ LINK = $(LIBTOOL) --mode=link $(COMPILE) $(LDFLAGS) -o $@ Index: php4/ext/satellite/corba.c diff -u php4/ext/satellite/corba.c:1.3 php4/ext/satellite/corba.c:1.4 --- php4/ext/satellite/corba.c:1.3 Sun Feb 25 22:07:15 2001 +++ php4/ext/satellite/corba.c Sat May 12 05:22:34 2001 @@ -17,7 +17,7 @@ */ /* - * $Id: corba.c,v 1.3 2001/02/26 06:07:15 andi Exp $ + * $Id: corba.c,v 1.4 2001/05/12 12:22:34 sas Exp $ * vim: syntax=c tabstop=2 shiftwidth=2 */ @@ -30,9 +30,7 @@ */ #include "corba.h" -#ifdef HAVE_CONFIG_H #include "php_config.h" /* for COMPILE_DL_ORBIT */ -#endif /* ZTS = thread-safe Zend */ #ifdef ZTS Index: php4/ext/satellite/php_orbit.c diff -u php4/ext/satellite/php_orbit.c:1.4 php4/ext/satellite/php_orbit.c:1.5 --- php4/ext/satellite/php_orbit.c:1.4 Sun Feb 25 22:07:15 2001 +++ php4/ext/satellite/php_orbit.c Sat May 12 05:22:34 2001 @@ -17,7 +17,7 @@ */ /* - * $Id: php_orbit.c,v 1.4 2001/02/26 06:07:15 andi Exp $ + * $Id: php_orbit.c,v 1.5 2001/05/12 12:22:34 sas Exp $ * vim: syntax=c tabstop=2 shiftwidth=2 */ @@ -38,9 +38,7 @@ #include "struct.h" -#ifdef HAVE_CONFIG_H #include "php_config.h" /* for COMPILE_DL_ORBIT */ -#endif /* see php4/README.SELF-CONTAINED-EXTENSIONS */ #if COMPILE_DL_SATELLITE