diff options
| author | foobar <sniper@php.net> | 2001-08-03 05:17:18 +0000 |
|---|---|---|
| committer | foobar <sniper@php.net> | 2001-08-03 05:17:18 +0000 |
| commit | f9e375f493a1aeacbbcc8f2f00880d05b4ba7aaf (patch) | |
| tree | 95472f9f2176b5d0aff78938e9bb1447c758c307 /acinclude.m4 | |
| parent | 85e15deabe2746a3c7a280dd32a41af7b8827e8a (diff) | |
| download | php-git-f9e375f493a1aeacbbcc8f2f00880d05b4ba7aaf.tar.gz | |
Changed the PHP_ADD_LIBRARY_DEFER() to work when building
standalone extensions. Also improved the checks for SSL and Kerberos in
IMAP extension configure.
Diffstat (limited to 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index d56f3f10d3..0e1d823e82 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -749,13 +749,27 @@ ifelse($3,,[ ]) dnl -dnl PHP_ADD_LIBRARY_DEFER(library[, append]) +dnl PHP_ADD_LIBRARY_DEFER(library[, append[, shared-libadd]]) dnl dnl add a library to the link line (deferred) +dnl AC_DEFUN(PHP_ADD_LIBRARY_DEFER,[ - ifelse($#, 1, DLIBS="-l$1 $DLIBS", DLIBS="$DLIBS -l$1") + case $1 in + c|c_r|pthread*) ;; + *) +ifelse($3,,[ + PHP_X_ADD_LIBRARY($1,$2,DLIBS) +],[ + if test "$ext_shared" = "yes"; then + PHP_X_ADD_LIBRARY($1,$2,$3) + else + PHP_ADD_LIBRARY_DEFER($1,$2) + fi ]) - + ;; + esac +]) + dnl dnl PHP_ADD_LIBRARY_WITH_PATH(library, path[, shared-libadd]) dnl |