diff options
| author | Thies C. Arntzen <thies@php.net> | 2000-05-08 08:27:48 +0000 |
|---|---|---|
| committer | Thies C. Arntzen <thies@php.net> | 2000-05-08 08:27:48 +0000 |
| commit | 3ee9304cd934199d3d06752fa549cdfa7988d425 (patch) | |
| tree | da93c6a27b72ab42dd8fe52347bd5ad554459604 | |
| parent | b8f9b480984a595bfcc6c8989589f5bc887f7f22 (diff) | |
| download | php-git-3ee9304cd934199d3d06752fa549cdfa7988d425.tar.gz | |
support empty libpath in AC_ADD_LIBRARY_WITH_PATH
make sure the link-order for shared and static builds are the same
| -rw-r--r-- | acinclude.m4 | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index e64294013b..0715502483 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -426,8 +426,10 @@ 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 -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 @@ ifelse($3,,[ 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 ]) ]) |