SOURCES (DEVEL): php-lib64.patch - more complete fix

arekm arekm at pld-linux.org
Thu Aug 25 23:05:16 CEST 2005


Author: arekm                        Date: Thu Aug 25 21:05:16 2005 GMT
Module: SOURCES                       Tag: DEVEL
---- Log message:
- more complete fix

---- Files affected:
SOURCES:
   php-lib64.patch (1.10.4.2 -> 1.10.4.3) 

---- Diffs:

================================================================
Index: SOURCES/php-lib64.patch
diff -u SOURCES/php-lib64.patch:1.10.4.2 SOURCES/php-lib64.patch:1.10.4.3
--- SOURCES/php-lib64.patch:1.10.4.2	Thu Aug 25 20:23:51 2005
+++ SOURCES/php-lib64.patch	Thu Aug 25 23:05:11 2005
@@ -1,6 +1,6 @@
 diff -urN php-5.1.0RC1.org/ext/ming/config.m4 php-5.1.0RC1/ext/ming/config.m4
 --- php-5.1.0RC1.org/ext/ming/config.m4	2005-07-18 01:58:39.000000000 +0200
-+++ php-5.1.0RC1/ext/ming/config.m4	2005-08-25 19:23:28.356268128 +0200
++++ php-5.1.0RC1/ext/ming/config.m4	2005-08-25 23:03:43.002336568 +0200
 @@ -9,7 +9,7 @@
    AC_CHECK_LIB(m, sin)
  
@@ -10,6 +10,22 @@
        MING_DIR=$i
        break
      fi
+@@ -34,11 +34,11 @@
+   ],[
+     AC_MSG_ERROR([Ming library 0.2a or greater required.])
+   ],[
+-    -L$MING_DIR/lib
++    -L$MING_DIR/$PHP_LIBDIR
+   ])
+   
+   PHP_ADD_INCLUDE($MING_INC_DIR)
+-  PHP_ADD_LIBRARY_WITH_PATH(ming, $MING_DIR/lib, MING_SHARED_LIBADD)
++  PHP_ADD_LIBRARY_WITH_PATH(ming, $MING_DIR/$PHP_LIBDIR, MING_SHARED_LIBADD)
+ 
+   AC_MSG_CHECKING([for destroySWFBlock])
+   AC_TRY_RUN([
+
+
 diff -urN php-5.1.0RC1.org/scripts/Makefile.frag php-5.1.0RC1/scripts/Makefile.frag
 --- php-5.1.0RC1.org/scripts/Makefile.frag	2005-08-08 18:06:48.000000000 +0200
 +++ php-5.1.0RC1/scripts/Makefile.frag	2005-08-25 20:21:39.533528512 +0200
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/php-lib64.patch?r1=1.10.4.2&r2=1.10.4.3&f=u




More information about the pld-cvs-commit mailing list