cvs: php-src(PHP_4_3) / acinclude.m4 configure.in

sniper Wed Jan 19 12:36:22 2005 EDT Modified files: (Branch: PHP_4_3) /php-src configure.in acinclude.m4 Log: MFH: - Fix the pic patch http://cvs.php.net/diff.php/php-src/configure.in?r1=1.396.2.148&r2=1.396.2.149&ty=u Index: php-src/configure.in diff -u php-src/configure.in:1.396.2.148 php-src/configure.in:1.396.2.149 --- php-src/configure.in:1.396.2.148 Sun Jan 9 20:11:50 2005 +++ php-src/configure.in Wed Jan 19 12:36:21 2005 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.396.2.148 2005/01/10 01:11:50 sniper Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.396.2.149 2005/01/19 17:36:21 sniper Exp $ -*- sh -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -207,7 +207,7 @@ AC_MSG_CHECKING([whether to force non-PIC code in shared modules]) case $host_alias in i?86-*-linux*|i?86-*-freebsd*) - if test "${with_pic+set}" != "set"; then + if test "${with_pic+set}" != "set" || test "$with_pic" = "no"; then with_pic=no AC_MSG_RESULT(yes) else @@ -844,9 +844,10 @@ ;; shared) enable_static=no - if test "${with_pic+set}" != "set"; then - standard_libtool_flag='-prefer-pic' - fi + case $with_pic in + yes) standard_libtool_flag='-prefer-pic';; + no) standard_libtool_flag='-prefer-non-pic';; + esac EXTRA_LDFLAGS="$EXTRA_LDFLAGS -avoid-version -module" ;; esac http://cvs.php.net/diff.php/php-src/acinclude.m4?r1=1.218.2.45&r2=1.218.2.46&ty=u Index: php-src/acinclude.m4 diff -u php-src/acinclude.m4:1.218.2.45 php-src/acinclude.m4:1.218.2.46 --- php-src/acinclude.m4:1.218.2.45 Fri Jan 7 01:21:42 2005 +++ php-src/acinclude.m4 Wed Jan 19 12:36:21 2005 @@ -1,4 +1,4 @@ -dnl $Id: acinclude.m4,v 1.218.2.45 2005/01/07 06:21:42 sniper Exp $ -*- autoconf -*- +dnl $Id: acinclude.m4,v 1.218.2.46 2005/01/19 17:36:21 sniper Exp $ -*- autoconf -*- dnl dnl This file contains local autoconf functions. @@ -790,12 +790,17 @@ php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)' php_cxx_post=' && echo > $[@]' php_lo=o - + + case $with_pic in + yes) pic_setting='-prefer-pic';; + no) pic_setting='-prefer-non-pic';; + esac + shared_c_pre='$(LIBTOOL) --mode=compile $(CC)' - shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) -prefer-pic' + shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting shared_c_post= shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)' - shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) -prefer-pic' + shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting shared_cxx_post= shared_lo=lo