cvs: /php4 acinclude.m4

sas Tue May 2 06:00:14 2000 EDT Modified files: /php4 acinclude.m4 Log: Add shared-libadd option to AC_ADD_LIBRARY_WITH_PATH. This lets you replace if test "$ext_shared" = "yes"; then FOO_SHARED_LIBADD="-R$LIBDIR -L$LIBDIR -l$LIB" else AC_ADD_LIBRARY_WITH_PATH($LIB, $LIBDIR) fi with AC_ADD_LIBRARY_WITH_PATH($LIB, $LIBDIR, FOO_SHARED_LIBADD) Index: php4/acinclude.m4 diff -u php4/acinclude.m4:1.74 php4/acinclude.m4:1.75 --- php4/acinclude.m4:1.74 Mon May 1 20:32:09 2000 +++ php4/acinclude.m4 Tue May 2 06:00:14 2000 @@ -1,4 +1,4 @@ -dnl $Id: acinclude.m4,v 1.74 2000/05/01 18:32:09 sas Exp $ +dnl $Id: acinclude.m4,v 1.75 2000/05/02 04:00:14 sas Exp $ dnl dnl This file contains local autoconf functions. @@ -375,13 +375,27 @@ ]) dnl -dnl AC_ADD_LIBRARY_WITH_PATH(library, path) +dnl AC_ADD_LIBRARY_WITH_PATH(library, path[, shared-libadd]) dnl -dnl add a library to the link line and path to linkpath/runpath +dnl add a library to the link line and path to linkpath/runpath. +dnl if shared-libadd is not empty and $ext_shared is yes, +dnl shared-libadd will be assigned the library information dnl AC_DEFUN(AC_ADD_LIBRARY_WITH_PATH,[ +ifelse($3,,[ AC_ADD_LIBPATH($2) AC_ADD_LIBRARY($1) +],[ + if test "$ext_shared" = "yes"; then + if test -n "$2"; then + $3="[$]$3 -R$2 -L$2" + fi + $3="[$]$3 -l$1" + else + AC_ADD_LIBPATH($2) + AC_ADD_LIBRARY($1) + fi +]) ]) dnl