ext/imap finding libraries

The following patch allows to find the kerberos libraries to be found in /usr, /usr/local, /usr/kerberos and a given path. If there are no objections i will commit this. marcus cvs -z3 -q diff ext\imap\config.m4 (in directory S:\php4-HEAD\) Index: ext/imap/config.m4 =================================================================== RCS file: /repository/php4/ext/imap/config.m4,v retrieving revision 1.48 diff -u -r1.48 config.m4

--- ext/imap/config.m4  20 Aug 2002 23:08:24 -0000      1.48

+++ ext/imap/config.m4 1 Nov 2002 10:31:21 -0000 @@ -67,15 +67,20 @@

     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.

+ for i in /usr /usr/local /usr/kerberos $PHP_KERBEROS; do

+    test -f $i/lib/libkrb5.$SHLIB_SUFFIX_NAME -o -f $i/lib/libkrb5.a && PHP_KERBEROS_DIR=$i

+ 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 )
-      ])
-    fi
+    ])

+ fi + + if test "$PHP_KERBEROS" != "no"; then

     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)