From: foobar <sniper@php.net>
Date: Wed, 19 Jan 2005 17:36:15 +0000 (+0000)
Subject: MFH: - Fix the pic patch
X-Git-Tag: php-5.0.4RC1~308
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7f28203b568deee50010c8f82b29010f4625d091;p=php

MFH: - Fix the pic patch
---

diff --git a/acinclude.m4 b/acinclude.m4
index 722f7afe0b..005920d068 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -786,12 +786,17 @@ AC_DEFUN([PHP_BUILD_PROGRAM],[
   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
 
diff --git a/configure.in b/configure.in
index 2ef41451c7..d2a7fa8a11 100644
--- a/configure.in
+++ b/configure.in
@@ -207,7 +207,7 @@ esac
 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
@@ -874,9 +874,10 @@ program|static)
 ;;
 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