Attachment 29047 Details for Bug 48623 – file.diff

[patch] file.diff

file.diff (text/plain), 2.29 KB, created by ck on 2003-02-24 11:30:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: ck

Created: 2003-02-24 11:30:11 UTC

Size: 2.29 KB

patch

obsolete

>--- mod_php4/scripts/configure.php.orig	Mon Feb 24 07:42:43 2003
>+++ mod_php4/scripts/configure.php	Mon Feb 24 11:44:43 2003
>@@ -34,7 +34,8 @@
> dBase		"dBase database support" OFF \
> GDBM		"GNU database manager support" OFF \
> OpenLDAP1	"OpenLDAP 1.x support" OFF \
>-OpenLDAP2	"OpenLDAP 2.x support" OFF \
>+OpenLDAP20	"OpenLDAP 2.0 support" OFF \
>+OpenLDAP21	"OpenLDAP 2.1 support" OFF \
> OpenSSL		"OpenSSL support" OFF \
> SNMP		"SNMP support" OFF \
> XML		"XML support" OFF \
>@@ -222,8 +223,8 @@
> 			echo "LIB_DEPENDS+=	ldap.1:\${PORTSDIR}/net/openldap12"
> 			echo "LIB_DEPENDS+=	lber.1:\${PORTSDIR}/net/openldap12"
> 			echo "CONFIGURE_ARGS+=--with-ldap=\${LOCALBASE}"
>-			if [ "$OPENLDAP2" ]; then
>-				echo "OpenLDAP1 and OpenLDAP2 are mutually exclusive." > /dev/stderr
>+			if [ "$OPENLDAP20" -o "$OPENLDAP21" ]; then
>+				echo "OpenLDAP1, OpenLDAP20 and OpenLDAP21 are mutually exclusive." > /dev/stderr
> 				rm -f ${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc
> 				exit 1
> 			fi
>@@ -232,19 +233,33 @@
> 			fi
> 			OPENLDAP1=1
> 			;;
>-		\"OpenLDAP2\")
>+		\"OpenLDAP20\")
> 			echo "LIB_DEPENDS+=	ldap.2:\${PORTSDIR}/net/openldap20"
> 			echo "LIB_DEPENDS+=	lber.2:\${PORTSDIR}/net/openldap20"
> 			echo "CONFIGURE_ARGS+=--with-ldap=\${LOCALBASE}"
>-			if [ "$OPENLDAP1" ]; then
>-				echo "OpenLDAP1 and OpenLDAP2 are mutually exclusive." > /dev/stderr
>+			if [ "$OPENLDAP1" -o "$OPENLDAP21" ]; then
>+				echo "OpenLDAP1, OpenLDAP20 and OpenLDAP21 are mutually exclusive." > /dev/stderr
> 				rm -f ${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc
> 				exit 1
> 			fi
> 			if [ -f /usr/lib/libkrb.a -a -f /usr/lib/libdes.a -a ! -L /usr/lib/libdes.a ]; then
> 				LIBS="${LIBS} -lkrb -ldes -L\${LOCALBASE}/lib"
> 			fi
>-			OPENLDAP2=1
>+			OPENLDAP20=1
>+			;;
>+		\"OpenLDAP21\")
>+			echo "LIB_DEPENDS+=	ldap.2:\${PORTSDIR}/net/openldap21"
>+			echo "LIB_DEPENDS+=	lber.2:\${PORTSDIR}/net/openldap21"
>+			echo "CONFIGURE_ARGS+=--with-ldap=\${LOCALBASE}"
>+			if [ "$OPENLDAP1" -o "$OPENLDAP20" ]; then
>+				echo "OpenLDAP1, OpenLDAP20 and OpenLDAP21 are mutually exclusive." > /dev/stderr
>+				rm -f ${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc
>+				exit 1
>+			fi
>+			if [ -f /usr/lib/libkrb.a -a -f /usr/lib/libdes.a -a ! -L /usr/lib/libdes.a ]; then
>+				LIBS="${LIBS} -lkrb -ldes -L\${LOCALBASE}/lib"
>+			fi
>+			OPENLDAP21=1
> 			;;
> 		\"OpenSSL\")
> 			echo "USE_OPENSSL=yes"

Actions: View | Diff

Attachments on bug 48623: 29047