Re: cvs: php-src /ext/ming config.m4

Yes, I think it can be safely MFH'ed. Thanks. At 01:52 PM 8/25/2005, Marcus Boerger wrote:

Hello RMs, should this be MFHed to 5.0.5 and 5.1.0 ? marcus Thursday, August 25, 2005, 10:49:49 PM, you wrote:

helly           Thu Aug 25 16:49:49 2005 EDT

Modified files:

    /php-src/ext/ming   config.m4

Log: - Bugfix #34257 lib64 not handled correctly in ming extension http://cvs.php.net/diff.php/php-src/ext/ming/config.m4?r1=1.22&r2=1.23&ty=u Index: php-src/ext/ming/config.m4 diff -u php-src/ext/ming/config.m4:1.22 php-src/ext/ming/config.m4:1.23

--- php-src/ext/ming/config.m4:1.22     Sun Jul 17 19:58:39 2005

+++ php-src/ext/ming/config.m4 Thu Aug 25 16:49:48 2005 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.22 2005/07/17 23:58:39 helly Exp $ +dnl $Id: config.m4,v 1.23 2005/08/25 20:49:48 helly Exp $ dnl PHP_ARG_WITH(ming, for MING support, @@ -9,7 +9,7 @@ AC_CHECK_LIB(m, sin) for i in $PHP_MING /usr/local /usr; do

-    if test -f $i/lib/libming.$SHLIB_SUFFIX_NAME -o -f $i/lib/libming.a; then
+    if test -f $i/$PHP_LIBDIR/libming.$SHLIB_SUFFIX_NAME -o -f $i/lib/libming.a; then
       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([ Best regards, Marcus