cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Wl,'-rpath vs. Wl,'-Wl,-rpath, the first instance of Wl is stripped off by

Browse Source 
APXS and thus the original command line option was incorrect.
- add some more Kerberos libraries which fixes the imap FLAVOR on ELF systems.
This commit is contained in:
brad 2002-04-06 21:16:16 +00:00
parent c6b1dd1878
commit e03b0a8cd9
1 changed files with 59 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
www/php3/patches/patch-configure
View File

@ -1,7 +1,16 @@
$OpenBSD: patch-configure,v 1.3 2001/11/18 19:57:25 brad Exp $
--- configure.orig Fri Oct 20 19:05:17 2000
+++ configure Mon Oct 15 01:11:36 2001
@@ -5157,8 +5157,8 @@
$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
@ -12,12 +21,23 @@ $OpenBSD: patch-configure,v 1.3 2001/11/18 19:57:25 brad Exp $
else
IMAP_INC_DIR=$withval/include
fi
@@ -5329,6 +5329,54 @@
@@ -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
@ -28,20 +48,20 @@ $OpenBSD: patch-configure,v 1.3 2001/11/18 19:57:25 brad Exp $
+ fi
+
+
+
+
+ unique=`echo $ac_n "asn1$ac_c" | tr -c -d a-zA-Z0-9`
+
+
+ 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 -lasn1"
+ 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
@ -52,8 +72,20 @@ $OpenBSD: patch-configure,v 1.3 2001/11/18 19:57:25 brad Exp $
+ 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
@ -64,6 +96,17 @@ $OpenBSD: patch-configure,v 1.3 2001/11/18 19:57:25 brad Exp $
+ 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
EOF