[patch] Required patch.

php-5.1.6-as-needed.patch (text/plain), 7.00 KB, created by Rafał Mużyło on 2006-09-02 02:08:39 UTC

diff -ur ext/iconv/config.m4 ext/iconv/config.m4
--- ext/iconv/config.m4	2006-01-03 14:25:06.000000000 +0100
+++ ext/iconv/config.m4	2006-09-01 11:51:57.000000000 +0200
@@ -48,8 +48,8 @@
 
     if test -z "$iconv_impl_name"; then
       AC_MSG_CHECKING([if using GNU libiconv])
-      php_iconv_old_ld="$LDFLAGS"
-      LDFLAGS="-liconv $LDFLAGS"
+      php_iconv_old_ld="$LIBS"
+      LIBS="-liconv $LIBS"
       AC_TRY_RUN([
 #include <$PHP_ICONV_H_PATH>
 int main() {
@@ -61,7 +61,7 @@
         iconv_impl_name="gnu_libiconv"
       ],[
         AC_MSG_RESULT(no)
-        LDFLAGS="$php_iconv_old_ld"
+        LIBS="$php_iconv_old_ld"
       ])
     fi
 
diff -ur ext/ldap/config.m4 ext/ldap/config.m4
--- ext/ldap/config.m4	2005-11-21 20:06:04.000000000 +0100
+++ ext/ldap/config.m4	2006-09-01 11:54:11.000000000 +0200
@@ -159,9 +159,9 @@
   
   dnl Save original values
   _SAVE_CPPFLAGS=$CPPFLAGS
-  _SAVE_LDFLAGS=$LDFLAGS
+  _SAVE_LIBS=$LIBS
   CPPFLAGS="$CPPFLAGS -I$LDAP_INCDIR"
-  LDFLAGS="$LDFLAGS $LDAP_SHARED_LIBADD"
+  LIBS="$LIBS $LDAP_SHARED_LIBADD"
 
   dnl Check for 3 arg ldap_set_rebind_proc
   AC_CACHE_CHECK([for 3 arg ldap_set_rebind_proc], ac_cv_3arg_setrebindproc,
@@ -191,5 +191,5 @@
   
   dnl Restore original values
   CPPFLAGS=$_SAVE_CPPFLAGS
-  LDFLAGS=$_SAVE_LDFLAGS
+  LIBS=$_SAVE_LIBS
 fi 
diff -ur ext/odbc/config.m4 ext/odbc/config.m4
--- ext/odbc/config.m4	2006-09-01 06:45:09.000000000 +0200
+++ ext/odbc/config.m4	2006-09-01 11:55:00.000000000 +0200
@@ -405,7 +405,7 @@
                           Sybase SQL Anywhere 5.5.00 on QNX, prior to
                           run configure script:
                               CPPFLAGS=\"-DODBC_QNX -DSQLANY_BUG\"
-                              LDFLAGS=-lunix
+                              LIBS=-lunix
                               CUSTOM_ODBC_LIBS=\"-ldblib -lodbc\"],
 [
   if test "$withval" = "yes"; then
diff -ur ext/pdo_odbc/config.m4 ext/pdo_odbc/config.m4
--- ext/pdo_odbc/config.m4	2006-09-01 06:45:09.000000000 +0200
+++ ext/pdo_odbc/config.m4	2006-09-01 12:01:33.000000000 +0200
@@ -137,9 +137,9 @@
   fi
 
   PDO_ODBC_INCLUDE="$pdo_odbc_def_cflags -I$PDO_ODBC_INCDIR -DPDO_ODBC_TYPE=\\\"$pdo_odbc_flavour\\\""
-  PDO_ODBC_LDFLAGS="$pdo_odbc_def_ldflags -L$PDO_ODBC_LIBDIR -l$pdo_odbc_def_lib"
+  PDO_ODBC_LDFLAGS="$pdo_odbc_def_ldflags -L$PDO_ODBC_LIBDIR -l$pdo_odbc_def_lib"
 
-  PHP_EVAL_LIBLINE([$PDO_ODBC_LDFLAGS], [PDO_ODBC_SHARED_LIBADD])
+  PHP_EVAL_LIBLINE([$PDO_ODBC_LIBS], [PDO_ODBC_SHARED_LIBADD])
 
   dnl Check first for an ODBC 1.0 function to assert that the libraries work
   PHP_CHECK_LIBRARY($pdo_odbc_def_lib, SQLBindCol,
diff -ur sapi/apache/config.m4 sapi/apache/config.m4
--- sapi/apache/config.m4	2006-09-01 06:45:24.000000000 +0200
+++ sapi/apache/config.m4	2006-09-01 12:07:09.000000000 +0200
@@ -46,7 +46,7 @@
     AC_MSG_ERROR([Aborting]) 
   fi 
 
-  APXS_LDFLAGS="@SYBASE_LFLAGS@ @SYBASE_LIBS@ @SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@"
+  APXS_LIBS="@SYBASE_LFLAGS@ @SYBASE_LIBS@ @SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@"
   APXS_INCLUDEDIR=`$APXS -q INCLUDEDIR`
   APXS_CFLAGS=`$APXS -q CFLAGS`
   APXS_HTTPD=`$APXS -q SBINDIR`/`$APXS -q TARGET`
@@ -267,6 +268,7 @@
   PHP_SUBST(APACHE_TARGET)
   PHP_SUBST(APXS)
   PHP_SUBST(APXS_LDFLAGS)
+  PHP_SUBST(APXS_LIBS)
   PHP_SUBST(APACHE_INSTALL)
   PHP_SUBST(STRONGHOLD)
 fi
diff -ur sapi/apache_hooks/config.m4 sapi/apache_hooks/config.m4
--- sapi/apache_hooks/config.m4	2005-05-30 01:16:46.000000000 +0200
+++ sapi/apache_hooks/config.m4	2006-09-01 12:08:31.000000000 +0200
@@ -47,7 +47,7 @@
     AC_MSG_ERROR([Aborting]) 
   fi 
 
-  APXS_LDFLAGS="@SYBASE_LFLAGS@ @SYBASE_LIBS@ @SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@"
+  APXS_LIBS="@SYBASE_LFLAGS@ @SYBASE_LIBS@ @SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@"
   APXS_INCLUDEDIR=`$APXS -q INCLUDEDIR`
   APXS_CFLAGS=`$APXS -q CFLAGS`
   APXS_HTTPD=`$APXS -q SBINDIR`/`$APXS -q TARGET`
@@ -269,6 +269,7 @@
   PHP_SUBST(APACHE_TARGET)
   PHP_SUBST(APXS)
   PHP_SUBST(APXS_LDFLAGS)
+  PHP_SUBST(APXS_LIBS)
   PHP_SUBST(APACHE_HOOKS_INSTALL)
   PHP_SUBST(STRONGHOLD)
 fi
--- acinclude.m4.old	2006-09-01 12:27:50.000000000 +0200
+++ acinclude.m4	2006-09-01 13:36:55.000000000 +0200
@@ -394,7 +394,7 @@
       if test "$ext_shared" = "yes"; then
         $2="[$]$2 -pthread"
       else
-        PHP_RUN_ONCE(EXTRA_LDFLAGS, [$ac_i], [EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"])
+        PHP_RUN_ONCE(EXTRA_LIBS, [$ac_i], [EXTRA_LIBS="$EXTRA_LIBS $ac_i"])
       fi
     ;;
     -l*[)]
@@ -852,15 +852,15 @@
   case $host_alias in
     *aix*[)]
       suffix=so
-      link_cmd='$(LIBTOOL) --mode=link ifelse($4,,[$(CC)],[$(CXX)]) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$3'/$1.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $($2) $(translit($1,a-z_-,A-Z__)_SHARED_LIBADD) && mv -f '$3'/.libs/$1.so '$3'/$1.so'
+      link_cmd='$(LIBTOOL) --mode=link ifelse($4,,[$(CC)],[$(CXX)]) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$3'/$1.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $($2) $(translit($1,a-z_-,A-Z__)_SHARED_LIBADD) $(EXTRA_LIBS) && mv -f '$3'/.libs/$1.so '$3'/$1.so'
       ;;
     *netware*[)]
       suffix=nlm
-      link_cmd='$(LIBTOOL) --mode=link ifelse($4,,[$(CC)],[$(CXX)]) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o [$]@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $($2) ifelse($1, php5lib, , -L$(top_builddir)/netware -lphp5lib) $(translit(ifelse($1, php5lib, $1, m4_substr($1, 3)),a-z_-,A-Z__)_SHARED_LIBADD)'
+      link_cmd='$(LIBTOOL) --mode=link ifelse($4,,[$(CC)],[$(CXX)]) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o [$]@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $($2) ifelse($1, php5lib, , -L$(top_builddir)/netware -lphp5lib) $(translit(ifelse($1, php5lib, $1, m4_substr($1, 3)),a-z_-,A-Z__)_SHARED_LIBADD) $(EXTRA_LIBS)'
       ;;
     *[)]
       suffix=la
-      link_cmd='$(LIBTOOL) --mode=link ifelse($4,,[$(CC)],[$(CXX)]) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o [$]@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $($2) $(translit($1,a-z_-,A-Z__)_SHARED_LIBADD)'
+      link_cmd='$(LIBTOOL) --mode=link ifelse($4,,[$(CC)],[$(CXX)]) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o [$]@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $($2) $(translit($1,a-z_-,A-Z__)_SHARED_LIBADD) $(EXTRA_LIBS)'
       ;;
   esac
 
@@ -1741,17 +1741,17 @@
 dnl
 AC_DEFUN([PHP_CHECK_LIBRARY], [
-  save_old_LDFLAGS=$LDFLAGS
+  save_old_LIBS=$LIBS
   ac_stuff="$5"
   
   save_ext_shared=$ext_shared
   ext_shared=yes
-  PHP_EVAL_LIBLINE([$]ac_stuff, LDFLAGS)
+  PHP_EVAL_LIBLINE([$]ac_stuff, LIBS)
   AC_CHECK_LIB([$1],[$2],[
-    LDFLAGS=$save_old_LDFLAGS
+    LIBS=$save_old_LIBS
     ext_shared=$save_ext_shared
     $3
   ],[
-    LDFLAGS=$save_old_LDFLAGS
+    LIBS=$save_old_LIBS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_$1[]_$2
     $4