e03b0a8cd9
APXS and thus the original command line option was incorrect. - add some more Kerberos libraries which fixes the imap FLAVOR on ELF systems.
113 lines
2.7 KiB
Plaintext
113 lines
2.7 KiB
Plaintext
$OpenBSD: patch-configure,v 1.4 2002/04/06 21:16:16 brad Exp $
|
|
--- configure.orig Fri Oct 20 15:05:17 2000
|
|
+++ configure Sat Apr 6 15:55:22 2002
|
|
@@ -1493,7 +1493,7 @@ fi
|
|
echo "$ac_t""$php_cv_cc_rpath" 1>&6
|
|
if test $php_cv_cc_rpath = "yes"; then
|
|
ld_runpath_switch="-Wl,-rpath,"
|
|
- apxs_runpath_switch="-Wl,'-rpath "
|
|
+ apxs_runpath_switch="-Wl,'-Wl,-rpath,"
|
|
else
|
|
ld_runpath_switch="-L"
|
|
apxs_runpath_switch="-L'"
|
|
@@ -5157,8 +5157,8 @@ if test "${with_imap+set}" = set; then
|
|
fi
|
|
if test "$withval" != "no" && test "$withval" != "yes"; then
|
|
IMAP_DIR=$withval
|
|
- if test -f $IMAP_DIR/include/imap/mail.h; then
|
|
- IMAP_INC_DIR=$IMAP_DIR/include/imap
|
|
+ if test -f $IMAP_DIR/include/c-client/mail.h; then
|
|
+ IMAP_INC_DIR=$IMAP_DIR/include/c-client
|
|
else
|
|
IMAP_INC_DIR=$withval/include
|
|
fi
|
|
@@ -5317,7 +5317,7 @@ if test "${with_imap+set}" = set; then
|
|
ai_p="`pwd`/$IMAP_INC_DIR"
|
|
fi
|
|
|
|
-
|
|
+
|
|
unique=`echo $ac_n "$ai_p$ac_c" | tr -c -d a-zA-Z0-9`
|
|
cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
|
|
if test -n "$unique" && test "`eval $cmd`" = "" ; then
|
|
@@ -5328,6 +5328,79 @@ if test "${with_imap+set}" = set; then
|
|
fi
|
|
|
|
fi
|
|
+
|
|
+
|
|
+
|
|
+
|
|
+ unique=`echo $ac_n "gssapi$ac_c" | tr -c -d a-zA-Z0-9`
|
|
+ cmd="echo $ac_n \"\$LIBRARY$unique$ac_c\""
|
|
+ if test -n "$unique" && test "`eval $cmd`" = "" ; then
|
|
+ eval "LIBRARY$unique=set"
|
|
+
|
|
+ EXTRA_LIBS="$EXTRA_LIBS -lgssapi"
|
|
+
|
|
+ fi
|
|
+
|
|
+
|
|
+
|
|
+
|
|
+ unique=`echo $ac_n "krb$ac_c" | tr -c -d a-zA-Z0-9`
|
|
+ cmd="echo $ac_n \"\$LIBRARY$unique$ac_c\""
|
|
+ if test -n "$unique" && test "`eval $cmd`" = "" ; then
|
|
+ eval "LIBRARY$unique=set"
|
|
+
|
|
+ EXTRA_LIBS="$EXTRA_LIBS -lkrb"
|
|
+
|
|
+ fi
|
|
+
|
|
+
|
|
+
|
|
+
|
|
+ unique=`echo $ac_n "krb5$ac_c" | tr -c -d a-zA-Z0-9`
|
|
+ cmd="echo $ac_n \"\$LIBRARY$unique$ac_c\""
|
|
+ if test -n "$unique" && test "`eval $cmd`" = "" ; then
|
|
+ eval "LIBRARY$unique=set"
|
|
+
|
|
+ EXTRA_LIBS="$EXTRA_LIBS -lkrb5"
|
|
+
|
|
+ fi
|
|
+
|
|
+
|
|
+
|
|
+
|
|
+ unique=`echo $ac_n "asn1$ac_c" | tr -c -d a-zA-Z0-9`
|
|
+ cmd="echo $ac_n \"\$LIBRARY$unique$ac_c\""
|
|
+ if test -n "$unique" && test "`eval $cmd`" = "" ; then
|
|
+ eval "LIBRARY$unique=set"
|
|
+
|
|
+ EXTRA_LIBS="$EXTRA_LIBS -lasn1"
|
|
+
|
|
+ fi
|
|
+
|
|
+
|
|
+
|
|
+
|
|
+ unique=`echo $ac_n "com_err$ac_c" | tr -c -d a-zA-Z0-9`
|
|
+ cmd="echo $ac_n \"\$LIBRARY$unique$ac_c\""
|
|
+ if test -n "$unique" && test "`eval $cmd`" = "" ; then
|
|
+ eval "LIBRARY$unique=set"
|
|
+
|
|
+ EXTRA_LIBS="$EXTRA_LIBS -lcom_err_pic"
|
|
+
|
|
+ fi
|
|
+
|
|
+
|
|
+
|
|
+
|
|
+ unique=`echo $ac_n "kafs$ac_c" | tr -c -d a-zA-Z0-9`
|
|
+ cmd="echo $ac_n \"\$LIBRARY$unique$ac_c\""
|
|
+ if test -n "$unique" && test "`eval $cmd`" = "" ; then
|
|
+ eval "LIBRARY$unique=set"
|
|
+
|
|
+ EXTRA_LIBS="$EXTRA_LIBS -lkafs"
|
|
+
|
|
+ fi
|
|
+
|
|
|
|
cat >> confdefs.h <<\EOF
|
|
#define HAVE_IMAP 1
|