Fix lib config for the case where YAZ depends on multiple libraries

diff --git a/ext/yaz/config.m4 b/ext/yaz/config.m4
index f5815794d55a4de9de1b2c90a830874afc7d7e4a..9fcc85d5bb24330e411da617d83e89152cd884d5 100644 (file)
--- a/ext/yaz/config.m4
+++ b/ext/yaz/config.m4
@@ -32,25 +32,19 @@ if test "$PHP_YAZ" != "no"; then
       AC_MSG_ERROR([YAZ version 1.9 or later required.])
     fi
 
-    dir=""
     for c in $YAZLIB; do
       case $c in
        -L*)
          dir=`echo $c|cut -c 3-|sed 's%/\.libs%%g'`
+         PHP_ADD_LIBPATH($dir,YAZ_SHARED_LIBADD)
         ;;
-       -lyaz*)
-        ;;
-       *)
-       PHP_EVAL_LIBLINE($c, YAZ_SHARED_LIBADD)
+       -l*)
+         lib=`echo $c|cut -c 3-`
+        PHP_ADD_LIBRARY($lib,YAZ_SHARED_LIBADD)
         ;;
       esac
     done
-    if test -n "$dir"; then
-      PHP_ADD_LIBPATH($dir,YAZ_SHARED_LIBADD)
-    fi
-    PHP_ADD_LIBRARY_DEFER(yaz,1,YAZ_SHARED_LIBADD)
     PHP_EVAL_INCLINE($YAZINC)
-    PHP_SUBST(YAZ_SHARED_LIBADD)
     PHP_NEW_EXTENSION(yaz, php_yaz.c, $ext_shared)
   else
     AC_MSG_ERROR([YAZ not found (missing $yazconfig)])