View | Details | Raw Unified | Return to bug 28948
Collapse All | Expand All

(-)mod_php4/files/patch-domxml (+49 lines)
Line 0 Link Here
1 
--- configure.orig	Fri Jul 13 00:00:47 2001
2 
+++ configure	Fri Jul 13 00:09:45 2001
3 
@@ -15339,13 +15339,13 @@
4
5 
 if test "$PHP_DOM" != "no"; then
6
7 
-  if test -r $PHP_DOM/include/libxml/tree.h; then
8 
+  if test -r $PHP_DOM/include/libxml2/libxml/tree.h; then
9 
     DOMXML_DIR=$PHP_DOM
10 
   else
11 
     echo $ac_n "checking for DOM in default path""... $ac_c" 1>&6
12 
 echo "configure:15347: checking for DOM in default path" >&5
13 
     for i in /usr/local /usr; do
14 
-      if test -r $i/include/libxml/tree.h; then
15 
+      if test -r $i/include/libxml2/libxml/tree.h; then
16 
         DOMXML_DIR=$i
17 
         echo "$ac_t""found in $i" 1>&6
18 
       fi
19 
@@ -15359,7 +15359,7 @@
20
21
22 
   old_CPPFLAGS=$CPPFLAGS
23 
-  CPPFLAGS=-I$DOMXML_DIR/include
24 
+  CPPFLAGS=-I$DOMXML_DIR/include/libxml2
25 
   echo $ac_n "checking for libxml version""... $ac_c" 1>&6
26 
 echo "configure:15365: checking for libxml version" >&5
27 
   cat > conftest.$ac_ext <<EOF
28 
@@ -15390,16 +15390,16 @@
29
30
31
32 
-  if test "$DOMXML_DIR/include" != "/usr/include"; then
33 
+  if test "$DOMXML_DIR/include/libxml2" != "/usr/include"; then
34
35 
-  if test -z "$DOMXML_DIR/include" || echo "$DOMXML_DIR/include" | grep '^/' >/dev/null ; then
36 
-    ai_p="$DOMXML_DIR/include"
37 
+  if test -z "$DOMXML_DIR/include/libxml2" || echo "$DOMXML_DIR/include/libxml2" | grep '^/' >/dev/null ; then
38 
+    ai_p="$DOMXML_DIR/include/libxml2"
39 
   else
40
41 
-    ep_dir="`echo $DOMXML_DIR/include|sed 's%/*[^/][^/]*/*$%%'`"
42 
+    ep_dir="`echo $DOMXML_DIR/include/libxml2|sed 's%/*[^/][^/]*/*$%%'`"
43
44 
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
45 
-    ai_p="$ep_realdir/`basename \"$DOMXML_DIR/include\"`"
46 
+    ai_p="$ep_realdir/`basename \"$DOMXML_DIR/include/libxml2\"`"
47 
   fi
48
49
(-)mod_php4/files/patch-imap-ssl (+11 lines)
Line 0 Link Here
1 
--- configure.orig	Thu Jun 21 07:28:57 2001
2 
+++ configure	Fri Jul 13 14:35:00 2001
3 
@@ -22877,7 +22877,7 @@
4
5
6 
     old_LIBS=$LIBS
7 
-    LIBS="$LIBS -lc-client"
8 
+    LIBS="$LIBS -l$IMAP_LIB"
9 
     if test $PHP_KERBEROS != "no"; then
10 
       LIBS="$LIBS -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err"
11 
     fi
(-)mod_php4/scripts/configure.php (+16 lines)
Lines 20-25 Link Here
20 
mhash		"Crypto-hashing support" OFF \
 20 
mhash		"Crypto-hashing support" OFF \
21 
pdflib		"pdflib support" OFF \
 21 
pdflib		"pdflib support" OFF \
22 
IMAP		"IMAP support" OFF \
 22 
IMAP		"IMAP support" OFF \
23 
IMAP-SSL	"IMAP-SSL support (implies IMAP)" OFF \
23 
MySQL		"MySQL database support" ON \
 24 
MySQL		"MySQL database support" ON \
24 
PostgreSQL	"PostgreSQL database support" OFF \
 25 
PostgreSQL	"PostgreSQL database support" OFF \
25 
SybaseDB	"Sybase/MS-SQL database support (DB-lib)" OFF \
 26 
SybaseDB	"Sybase/MS-SQL database support (DB-lib)" OFF \
Lines 31-36 Link Here
31 
SNMP		"SNMP support" OFF \
 32 
SNMP		"SNMP support" OFF \
32 
XML		"XML support" OFF \
 33 
XML		"XML support" OFF \
33 
XSLT		"Sablotron support (implies XML and iconv)" OFF \
 34 
XSLT		"Sablotron support (implies XML and iconv)" OFF \
35 
XMLDOM		"LibXML2 support (implies iconv)" OFF \
34 
FTP		"File Transfer Protocol support" OFF \
 36 
FTP		"File Transfer Protocol support" OFF \
35 
CURL		"CURL support" OFF \
 37 
CURL		"CURL support" OFF \
36 
gettext		"gettext library support" OFF \
 38 
gettext		"gettext library support" OFF \
Lines 109-114 Link Here
109 
		\"IMAP\")
 111 
		\"IMAP\")
110 
			echo "LIB_DEPENDS+=	c-client4.8:\${PORTSDIR}/mail/cclient"
 112 
			echo "LIB_DEPENDS+=	c-client4.8:\${PORTSDIR}/mail/cclient"
111 
			echo "CONFIGURE_ARGS+=--with-imap=\${PREFIX}"
 113 
			echo "CONFIGURE_ARGS+=--with-imap=\${PREFIX}"
114 
			IMAP=1
115 
			;;
116 
		\"IMAP-SSL\")
117 
			echo "CONFIGURE_ARGS+=--with-imap-ssl=\${PREFIX}"
118 
			if [ -z "$IMAP" ]; then
119 
				set $* \"IMAP\"
120 
			fi
112 
			;;
 121 
			;;
113 
		\"MySQL\")
 122 
		\"MySQL\")
114 
			echo "LIB_DEPENDS+=	mysqlclient.10:\${PORTSDIR}/databases/mysql323-client"
 123 
			echo "LIB_DEPENDS+=	mysqlclient.10:\${PORTSDIR}/databases/mysql323-client"
Lines 186-191 Link Here
186 
			if [ -z "$XML" ]; then
 195 
			if [ -z "$XML" ]; then
187 
				set $* \"XML\"
 196 
				set $* \"XML\"
188 
			fi
 197 
			fi
198 
			if [ -z "$ICONV" ]; then
199 
				set $* \"iconv\"
200 
			fi
201 
			;;
202 
		\"XMLDOM\")
203 
			echo "LIB_DEPENDS+=	xml2.5:\${PORTSDIR}/textproc/libxml2"
204 
			echo "CONFIGURE_ARGS+=--with-dom=\${PREFIX}"
189 
			if [ -z "$ICONV" ]; then
 205 
			if [ -z "$ICONV" ]; then
190 
				set $* \"iconv\"
 206 
				set $* \"iconv\"
191 
			fi
 207 
			fi

Return to bug 28948