sniper Fri Nov 1 11:46:00 2002 EDT
Modified files:
/php4/ext/imap config.m4
Log:
- Added searching for Kerberos libs in default locations if no path is
given for --with-kerberos.
# Marcus, please try this. :)
Index: php4/ext/imap/config.m4
diff -u php4/ext/imap/config.m4:1.48 php4/ext/imap/config.m4:1.49
--- php4/ext/imap/config.m4:1.48 Tue Aug 20 19:08:24 2002
+++ php4/ext/imap/config.m4 Fri Nov 1 11:45:59 2002
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.48 2002/08/20 23:08:24 kalowsky Exp $
+dnl $Id: config.m4,v 1.49 2002/11/01 16:45:59 sniper Exp $
dnl
AC_DEFUN(IMAP_INC_CHK,[if test -r "$i$1/c-client.h"; then
@@ -63,19 +63,29 @@
PHP_KERBEROS=no
])
- if test "$PHP_KERBEROS" = "yes"; then
- test -d /usr/kerberos && PHP_KERBEROS=/usr/kerberos
- fi
-
if test "$PHP_KERBEROS" != "no"; then
- if test ! -f $PHP_KERBEROS/lib/libkrb5.a && test ! -f
$PHP_KERBEROS/lib/libkrb5.$SHLIB_SUFFIX_NAME; then
- AC_MSG_ERROR([Kerberos libraries not found in $PHP_KERBEROS/lib.
+
+ if test "$PHP_KERBEROS" = "yes"; then
+ SEARCH_PATHS="/usr/kerberos /usr/local /usr"
+ else
+ SEARCH_PATHS=$PHP_KERBEROS
+ fi
+
+ for i in $SEARCH_PATHS; do
+ if test -f $i/lib/libkrb5.a || test -f $i/lib/libkrb5.$SHLIB_SUFFIX_NAME; then
+ PHP_KERBEROS_DIR=$i
+ break
+ fi
+ done
+
+ if test -z "$PHP_KERBEROS_DIR"; then
+ AC_MSG_ERROR([Kerberos libraries not found.
- Check the path given to --with-kerberos (if no path is given, defaults to
/usr/kerberos )
+ Check the path given to --with-kerberos (if no path is given, searches in
+/usr/kerberos, /usr/local and /usr )
])
fi
AC_DEFINE(HAVE_IMAP_KRB,1,[ ])
- PHP_ADD_LIBPATH($PHP_KERBEROS/lib, IMAP_SHARED_LIBADD)
+ PHP_ADD_LIBPATH($PHP_KERBEROS_DIR/lib, IMAP_SHARED_LIBADD)
PHP_ADD_LIBRARY(gssapi_krb5, 1, IMAP_SHARED_LIBADD)
PHP_ADD_LIBRARY(krb5, 1, IMAP_SHARED_LIBADD)
PHP_ADD_LIBRARY(k5crypto, 1, IMAP_SHARED_LIBADD)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
