From 1b9f861fd8da231a717a89d96cf41c55c715bd92 Mon Sep 17 00:00:00 2001
From: Clement Laforet <clement@FreeBSD.org>
Date: Sun, 8 Aug 2004 10:03:56 +0000
Subject: - We are no more forced to used libdbi

Obtained from:	authors
---
 www/mod_log_sql2/Makefile              |  7 +++--
 www/mod_log_sql2/files/patch-configure | 47 ++++++++++++++++++++++++++++++++++
 2 files changed, 52 insertions(+), 2 deletions(-)
 create mode 100644 www/mod_log_sql2/files/patch-configure

(limited to 'www/mod_log_sql2')

diff --git a/www/mod_log_sql2/Makefile b/www/mod_log_sql2/Makefile
index 50b4645ff425..34183241bfd8 100644
--- a/www/mod_log_sql2/Makefile
+++ b/www/mod_log_sql2/Makefile
@@ -20,10 +20,13 @@ USE_GMAKE=	yes
 CONFIGURE_ARGS+=	--with-apxs=${APXS}
 SSL_PLIST=	"@comment "
 PLIST_SUB+=	SSL=${SSL_PLIST}
-CONFIGURE_ARGS+=	--with-dbi=${LOCALBASE}
-LIB_DEPENDS+=	dbi.0:${PORTSDIR}/databases/libdbi
 CONFIGURE_ENV+=	LIBS="-L${LOCALBASE}/lib -L${LOCALBASE}/lib/mysql"
 
+.if defined(WITH_DBI)
+CONFIGURE_ARGS+=	--with-dbi=${LOCALBASE}
+LIB_DEPENDS+=		dbi.0:${PORTSDIR}/databases/libdbi
+.endif
+
 .include <bsd.port.pre.mk>
 .include "${PORTSDIR}/www/apache2/Makefile.modules.3rd"
 .if defined(WITH_SSL)
diff --git a/www/mod_log_sql2/files/patch-configure b/www/mod_log_sql2/files/patch-configure
new file mode 100644
index 000000000000..efde1044c5f7
--- /dev/null
+++ b/www/mod_log_sql2/files/patch-configure
@@ -0,0 +1,47 @@
+--- configure.old	Tue Jul 20 17:47:33 2004
++++ configure	Mon Aug  2 02:21:00 2004
+@@ -3174,9 +3174,8 @@
+         MYSQL_CFLAGS=""
+         MYSQL_LDFLAGS=""
+         MYSQL_LIBS=""
+-        { { echo "$as_me:$LINENO: error: *** Mysql client libraries not found!" >&5
+-echo "$as_me: error: *** Mysql client libraries not found!" >&2;}
+-   { (exit 1); exit 1; }; }
++        { echo "$as_me:$LINENO: WARNING: *** Mysql client libraries not found!" >&5
++echo "$as_me: WARNING: *** Mysql client libraries not found!" >&2;}
+         WANT_MYSQL_MOD=0
+ 
+       fi
+@@ -3218,9 +3217,8 @@
+ done
+ 
+ if test -z "$DBI_CFLAGS"; then
+-  { { echo "$as_me:$LINENO: error: ** libDBI client libraries not found!" >&5
+-echo "$as_me: error: ** libDBI client libraries not found!" >&2;}
+-   { (exit 1); exit 1; }; }
++  { echo "$as_me:$LINENO: WARNING: ** libDBI client libraries not found!" >&5
++echo "$as_me: WARNING: ** libDBI client libraries not found!" >&2;}
+         WANT_DBI_MOD=0
+ 
+ fi
+@@ -3309,9 +3307,8 @@
+     fi
+ done
+ if test -z "$DBI_LDFLAGS"; then
+-  { { echo "$as_me:$LINENO: error: ** libDBI client libraries not found!" >&5
+-echo "$as_me: error: ** libDBI client libraries not found!" >&2;}
+-   { (exit 1); exit 1; }; }
++  { echo "$as_me:$LINENO: WARNING: ** libDBI client libraries not found!" >&5
++echo "$as_me: WARNING: ** libDBI client libraries not found!" >&2;}
+         WANT_DBI_MOD=0
+ 
+ else
+@@ -4004,7 +4001,7 @@
+ 
+ case "$target" in
+ 	*-*-solaris* | *-*-osf* )
+-		if test $APACHE_VERSION -eq 1.3; then
++		if test $AP_VERSION -eq 1.3; then
+ 			RT_LIBS=-lrt
+ 		fi
+ 		;;
-- 
cgit v1.2.3