changeset 1287:38b7fe3a596e HEAD

pgsql check fixes
author Timo Sirainen <tss@iki.fi>
date Fri, 07 Mar 2003 02:40:33 +0200
parents b8ecb067141a
children fa47d787c2aa
files configure.in
diffstat 1 files changed, 16 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/configure.in	Fri Mar 07 02:37:22 2003 +0200
+++ b/configure.in	Fri Mar 07 02:40:33 2003 +0200
@@ -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