Fix 002-configure.patch not applying cleanly (#4036)

SVN-Revision: 12725

diff --git a/lang/php4/patches/002-configure.patch b/lang/php4/patches/002-configure.patch
index 94bba0a3686f5590c95e5af4ca5a618c6bb38f24..1197cdee3eb4b2f7da7cfb1b76e4f1cc191dfc5b 100644 (file)
--- a/lang/php4/patches/002-configure.patch
+++ b/lang/php4/patches/002-configure.patch
@@ -1,6 +1,6 @@
---- php-4.3.11/configure       2005-03-30 16:35:34.000000000 +0200
-+++ php-4.3.11-patched/configure       2005-06-22 23:34:35.000000000 +0200
-@@ -12192,7 +12192,7 @@
+--- a/configure.orig   2008-09-24 16:00:23.000000000 +0900
++++ a/configure        2008-09-24 16:00:45.000000000 +0900
+@@ -12503,7 +12503,7 @@
      ac_libs=$LIBS
      LIBS="$LIBS -ldl"
      if test "$cross_compiling" = yes; then
@@ -8,8 +8,8 @@
 +  found=yes
  else
    cat > conftest.$ac_ext <<EOF
- #line 12199 "configure"
-@@ -14062,7 +14062,7 @@
+ #line 12510 "configure"
+@@ -14373,7 +14373,7 @@
  
                
                if test "$cross_compiling" = yes; then
@@ -17,17 +17,17 @@
 +    { echo "configure: error: can not run test program while cross compiling" 1>&2; }
  else
    cat > conftest.$ac_ext <<EOF
- #line 14069 "configure"
-@@ -15077,7 +15077,7 @@
- if { (eval echo configure:15078: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ #line 14380 "configure"
+@@ -15622,7 +15622,7 @@
+ if { (eval echo configure:15623: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    if test "$cross_compiling" = yes; then
 -    { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
 +    { echo "configure: error: can not run test program while cross compiling" 1>&2; }
  else
    cat > conftest.$ac_ext <<EOF
- #line 15084 "configure"
-@@ -15574,7 +15574,7 @@
+ #line 15629 "configure"
+@@ -16119,7 +16119,7 @@
    rm -fr conftest*
    
    if test "$cross_compiling" = yes; then
@@ -35,17 +35,17 @@
 +    { echo "configure: error: can not run test program while cross compiling" 1>&2; }
  else
    cat > conftest.$ac_ext <<EOF
- #line 15581 "configure"
-@@ -41304,7 +41304,7 @@
+ #line 16126 "configure"
+@@ -43884,7 +43884,7 @@
      echo $ac_n "checking if iconv supports errno""... $ac_c" 1>&6
- echo "configure:41306: checking if iconv supports errno" >&5
+ echo "configure:43886: checking if iconv supports errno" >&5
      if test "$cross_compiling" = yes; then
 -    { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
 +    { echo "configure: error: can not run test program while cross compiling" 1>&2; }
  else
    cat > conftest.$ac_ext <<EOF
- #line 41311 "configure"
-@@ -43584,7 +43584,7 @@
+ #line 43891 "configure"
+@@ -46342,7 +46342,7 @@
    old_LIBS=$LIBS
    LIBS="$TST_LIBS $LIBS"
    if test "$cross_compiling" = yes; then
@@ -53,8 +53,8 @@
 +    { echo "configure: error: can not run test program while cross compiling" 1>&2; }
  else
    cat > conftest.$ac_ext <<EOF
- #line 43591 "configure"
-@@ -43643,7 +43643,7 @@
+ #line 46349 "configure"
+@@ -46401,7 +46401,7 @@
    old_LIBS=$LIBS
    LIBS="$TST_LIBS $LIBS"
    if test "$cross_compiling" = yes; then
@@ -62,8 +62,8 @@
 +    { echo "configure: error: can not run test program while cross compiling" 1>&2; }
  else
    cat > conftest.$ac_ext <<EOF
- #line 43650 "configure"
-@@ -89183,7 +89183,7 @@
+ #line 46408 "configure"
+@@ -93621,7 +93621,7 @@
      old_CPPFLAGS=$CPPFLAGS
      CPPFLAGS="$CPPFLAGS -I$XSLT_DIR/include"
      if test "$cross_compiling" = yes; then
@@ -71,8 +71,8 @@
 +    { echo "configure: error: can not run test program while cross compiling" 1>&2; }
  else
    cat > conftest.$ac_ext <<EOF
- #line 89190 "configure"
-@@ -98257,7 +98257,7 @@
+ #line 93628 "configure"
+@@ -102812,7 +102812,7 @@
  link_all_deplibs=$link_all_deplibs
  
  # Compile-time system search path for libraries