cvs: php4 /

thies Mon May 8 01:27:48 2000 EDT Modified files: /php4 acinclude.m4 Log: support empty libpath in AC_ADD_LIBRARY_WITH_PATH make sure the link-order for shared and static builds are the same Index: php4/acinclude.m4 diff -u php4/acinclude.m4:1.80 php4/acinclude.m4:1.81 --- php4/acinclude.m4:1.80 Sat May 6 22:32:54 2000 +++ php4/acinclude.m4 Mon May 8 01:27:48 2000 @@ -1,4 +1,4 @@ -dnl $Id: acinclude.m4,v 1.80 2000/05/07 05:32:54 sas Exp $ +dnl $Id: acinclude.m4,v 1.81 2000/05/08 08:27:48 thies Exp $ dnl dnl This file contains local autoconf functions. @@ -426,8 +426,10 @@ dnl AC_DEFUN(AC_ADD_LIBRARY_WITH_PATH,[ ifelse($3,,[ - AC_ADD_LIBPATH($2) - AC_ADD_LIBRARY($1) + if test -n "$2"; then + AC_ADD_LIBPATH($2) + fi + AC_ADD_LIBRARY($1,1) ],[ if test "$ext_shared" = "yes"; then if test -n "$2"; then @@ -435,8 +437,10 @@ fi $3="[$]$3 -l$1" else - AC_ADD_LIBPATH($2) - AC_ADD_LIBRARY($1) + if test -n "$2"; then + AC_ADD_LIBPATH($2) + fi + AC_ADD_LIBRARY($1,1) fi ]) ])