[dovecot-cvs] dovecot configure.in,1.108,1.109

cras at procontrol.fi cras at procontrol.fi
Fri Mar 7 02:40:35 EET 2003


Update of /home/cvs/dovecot
In directory danu:/tmp/cvs-serv32253

Modified Files:
	configure.in 
Log Message:
pgsql check fixes



Index: configure.in
===================================================================
RCS file: /home/cvs/dovecot/configure.in,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -d -r1.108 -r1.109
--- configure.in	7 Mar 2003 00:37:22 -0000	1.108
+++ configure.in	7 Mar 2003 00:40:33 -0000	1.109
@@ -794,17 +794,29 @@
 	done
 
 	old_LIBS=$LIBS
-	LIBS="$LIBS -L$PGSQL_LIBDIR"
+	if test "$PGSQL_LIBDIR" != ""; then
+		LIBS="$LIBS -L$PGSQL_LIBDIR"
+	fi
 
 	AC_CHECK_LIB(pq, PQconnectdb, [
-		AC_CHECK_HEADER($PGSQL_INCLUDE/libpq-fe.h, [
-			AUTH_CFLAGS="$AUTH_CFLAGS -I$PGSQL_INCLUDE"
-			AUTH_LIBS="$AUTH_LIBS -L$PGSQL_LIBDIR -lpq"
+		old_CPPFLAGS=$CPPFLAGS
+		if test "$PGSQL_INCLUDE" != ""; then
+			CPPFLAGS="$CPPFLAGS -I $PGSQL_INCLUDE"
+		fi
+		AC_CHECK_HEADER(libpq-fe.h, [
+			if test "$PGSQL_INCLUDE" != ""; then
+				AUTH_CFLAGS="$AUTH_CFLAGS -I$PGSQL_INCLUDE"
+			fi
+			if test "$PGSQL_LIBDIR" != ""; then
+				AUTH_LIBS="$AUTH_LIBS -L$PGSQL_LIBDIR"
+			fi
+			AUTH_LIBS="$AUTH_LIBS -lpq"
 			AC_DEFINE(USERDB_PGSQL,, Build with PostgreSQL support)
 			AC_DEFINE(PASSDB_PGSQL,, Build with PostgreSQL support)
 			userdb="$userdb pgsql"
 			passdb="$passdb pgsql"
 		])
+		CPPFLAGS=$old_CPPFLAGS
 	])
 	LIBS=$old_LIBS
 fi




More information about the dovecot-cvs mailing list