openbsd-ports/www/mod_mp3/patches/patch-configure

$OpenBSD: patch-configure,v 1.2 2004/06/13 03:25:17 pvalchev Exp $
--- configure.orig	2002-09-19 00:13:21.000000000 -0600
+++ configure	2004-06-12 21:24:18.000000000 -0600
@@ -198,15 +198,17 @@ sub with_pgsql {
 	print "checking for pgsql... ";
 	
 	if ($value) { 
-		if (! -e "$value/include/pgsql/postgres.h") {
-			print "Error! $value/include/pgsql/postgres.h not found\n";
+		my $libpq = "$value/lib/libpq.so";
+
+		if (! -e "$value/include/postgresql/postgres_ext.h") {
+			print "Error! $value/include/postgresql/postgres_ext.h not found\n";
 			exit 1;
 		}
-		if (! -e "$value/lib/libpq.so") {
+		if (! grep /^$libpq(\.\d+){0,3}/, <$libpq.*>) {
 			print "Error! $value/lib/libpq.so not found\n";
 			exit 1;
 		}
-		$INC .= " -I$value/include/pgsql/ ";
+		$INC .= " -I$value/include/postgresql/ ";
 		$LIB .= " -L$value/lib/ -lpq ";
 		$DEF .= " -DPGSQL_ENABLED ";
 		print "found\n";
@@ -267,11 +269,13 @@ sub with_mysql {
 	print "checking for mysql... ";
 	
 	if ($value) { 
+		my $libmy = "$value/lib/libmysqlclient.so";
+ 
 		if (! -e "$value/include/mysql/mysql.h") {
 			print "Error! $value/include/mysql/mysql.h not found\n";
 			exit 1;
 		}
-		if (! -e "$value/lib/libmysqlclient.so") {
+		if (! grep /^$libmy(\.\d+){0,3}/, <$libmy.*>) {
 			print "Error! $value/lib/libmysqlclient.so not found\n";
 			exit 1;
 		}
@@ -567,7 +571,7 @@ PREOP = @$(NOOP)
 POSTOP = @$(NOOP)
 TO_UNIX = @$(NOOP)
 
-AINCLUDEDIR=-I`$(APXS) -q INCLUDEDIR` `$(APXS) -q CFLAGS`
+AINCLUDEDIR=-I`$(APXS) -q INCLUDEDIR` `$(APXS) -q CFLAGS CFLAGS_SHLIB`
 ACFLAGS=-I`$(APXS) -q INCLUDEDIR`
 LD_SHLIB=`$(APXS) -q LDFLAGS_SHLIB`
 CC=`$(APXS) -q CC`