Re: [PHP-CVS] cvs: php-src(PHP_4_3) / acinclude.m4 /ext/zlibconfig0.m4

[Jani Taskinen]

    Unfortunately the configure breaks for me now.
    (worked fine before this change).
    
    Happens somewhere in ext/fdf/config.m4, the fdf libpath
    is somehow forgotten in the tests, and it never gets in when
    added later, causing all the tests after ext/fdf to fail
    because the -lFdfTk is not found.

    --Jani
    

On Tue, 1 Jul 2003, Sascha Schumann wrote:

>sas            Tue Jul  1 19:54:44 2003 EDT
>
>  Modified files:              (Branch: PHP_4_3)
>    /php-src   acinclude.m4 
>    /php-src/ext/zlib  config0.m4 
>  Log:
>  Make PHP_CHECK_LIBRARY use PHP_EVAL_LIBLINE which automatically
>  eliminates /usr/lib references
>  
>  
>Index: php-src/acinclude.m4
>diff -u php-src/acinclude.m4:1.218.2.19 php-src/acinclude.m4:1.218.2.20
>--- php-src/acinclude.m4:1.218.2.19    Sat Jun 28 08:29:07 2003
>+++ php-src/acinclude.m4       Tue Jul  1 19:54:44 2003
>@@ -1,4 +1,4 @@
>-dnl $Id: acinclude.m4,v 1.218.2.19 2003/06/28 12:29:07 sas Exp $
>+dnl $Id: acinclude.m4,v 1.218.2.20 2003/07/01 23:54:44 sas Exp $
> dnl
> dnl This file contains local autoconf functions.
> 
>@@ -1596,13 +1596,14 @@
> 
> 
> dnl
>-dnl PHP_CHECK_LIBRARY(library, function [, action-found [, action-not-found [, 
>extra-libs]]])
>+dnl PHP_CHECK_LIBRARY(library, function [, action-found [, action-not-found [, 
>extra-ldflags]]])
> dnl
> dnl Wrapper for AC_CHECK_LIB
> dnl
> AC_DEFUN([PHP_CHECK_LIBRARY], [
>   save_old_LDFLAGS=$LDFLAGS
>-  LDFLAGS="$5 $LDFLAGS"
>+  ac_stuff="$5"
>+  PHP_EVAL_LIBLINE([$]ac_stuff, LDFLAGS)
>   AC_CHECK_LIB([$1],[$2],[
>     LDFLAGS=$save_old_LDFLAGS
>     $3
>Index: php-src/ext/zlib/config0.m4
>diff -u php-src/ext/zlib/config0.m4:1.12.2.2 php-src/ext/zlib/config0.m4:1.12.2.3
>--- php-src/ext/zlib/config0.m4:1.12.2.2       Thu Jun 26 20:37:53 2003
>+++ php-src/ext/zlib/config0.m4        Tue Jul  1 19:54:44 2003
>@@ -1,5 +1,5 @@
> dnl
>-dnl $Id: config0.m4,v 1.12.2.2 2003/06/27 00:37:53 sas Exp $
>+dnl $Id: config0.m4,v 1.12.2.3 2003/07/01 23:54:44 sas Exp $
> dnl
> 
> PHP_ARG_WITH(zlib,for ZLIB support,
>@@ -36,17 +36,12 @@
>     AC_MSG_ERROR(Cannot find libz)
>   fi
> 
>-  case $ZLIB_DIR in
>-  /usr) ac_extra= ;; 
>-  *) ac_extra=-L$ZLIB_DIR/lib ;;
>-  esac
>-
>   PHP_CHECK_LIBRARY(z, gzgets, [
>     AC_DEFINE(HAVE_ZLIB,1,[ ]) 
>   ],[
>     AC_MSG_ERROR(ZLIB extension requires zlib >= 1.0.9)
>   ],[
>-    $ac_extra
>+    -L$ZLIB_DIR/lib
>   ])
> 
>   PHP_ADD_LIBPATH($ZLIB_DIR/lib, ZLIB_SHARED_LIBADD)
>
>
>
>

-- 
https://www.paypal.com/xclick/[EMAIL PROTECTED]&no_note=1&tax=0&currency_code=EUR
 


-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php