File: postgres_configure.dpatch

package info (click to toggle)
dovecot 1.0.rc15-2etch5
  • links: PTS
  • area: main
  • in suites: etch
  • size: 8,808 kB
  • ctags: 9,428
  • sloc: ansic: 94,231; sh: 9,563; makefile: 1,320; yacc: 948; lex: 253
file content (54 lines) | stat: -rw-r--r-- 1,554 bytes parent folder | download | duplicates (3)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
#! /bin/sh -e

## DP: Make configure use pg_config  if it is available.
## DP: Author: Jaldhar H. Vyas <jaldhar@debian.org>

. $(dirname $0)/DPATCH

exit 0
@DPATCH@
--- dovecot-1.0.beta7/configure.in	2006-04-13 00:28:20.000000000 -0400
+++ dovecot-1.0.beta7/configure.in.debian	2006-04-13 00:42:04.000000000 -0400
@@ -1392,21 +1392,29 @@
 fi
 
 if test $want_pgsql = yes; then
-	# based on code from PHP
-	for i in /usr /usr/local /usr/local/pgsql; do
-		for j in include include/pgsql include/postgres include/postgresql ""; do
-			if test -r "$i/$j/libpq-fe.h"; then
-				PGSQL_INCLUDE=$i/$j
-			fi
+	PGSQL_INCLUDE="`pg_config --includedir`"
+	if test "$PGSQL_INCLUDE" = ""; then
+		# based on code from PHP
+		for i in /usr /usr/local /usr/local/pgsql; do
+			for j in include include/pgsql include/postgres include/postgresql ""; do
+				if test -r "$i/$j/libpq-fe.h"; then
+					PGSQL_INCLUDE=$i/$j
+				fi
+			done
 		done
-		for lib in lib lib64; do
-		  for j in $lib $lib/pgsql $lib/postgres $lib/postgresql ""; do
-			if test -f "$i/$j/libpq.so" || test -f "$i/$j/libpq.a"; then
-				PGSQL_LIBDIR=$i/$j
-			fi
-		  done
+	fi
+	PGSQL_LIBDIR="`pg_config --libdir`"
+	if test "$PGSQL_LIBDIR" = ""; then
+		for i in /usr /usr/local /usr/local/pgsql; do
+			for lib in lib lib64; do
+			  for j in $lib $lib/pgsql $lib/postgres $lib/postgresql ""; do
+				if test -f "$i/$j/libpq.so" || test -f "$i/$j/libpq.a"; then
+					PGSQL_LIBDIR=$i/$j
+				fi
+		  	  done
+			done
 		done
-	done
+	fi
 
 	old_LIBS=$LIBS
 	if test "$PGSQL_LIBDIR" != ""; then