From 9c14ac2c4795eeedf8dcd08aa76bf08a10b910f5 Mon Sep 17 00:00:00 2001
From: Peter Eisentraut <peter_e@gmx.net>
Date: Fri, 4 May 2007 10:22:32 +0000
Subject: [PATCH] Revert pg_config breakage

---
 configure.ac | 26 +++++++-------------------
 1 file changed, 7 insertions(+), 19 deletions(-)

diff --git a/configure.ac b/configure.ac
index c79256b..e82ca23 100644
--- a/configure.ac
+++ b/configure.ac
@@ -248,30 +248,18 @@ AC_TYPE_SIZE_T
 AC_STRUCT_TM
 
 #
-# PostgreSQL setting
+# Find libpq headers and libraries
 #
+AC_PATH_PROGS(PG_CONFIG, pg_config)
 
-AC_ARG_WITH(pgconf,
-        [AC_HELP_STRING([--with-pgconf=pg_config],
-        [specify pg_config with full path when it is not easy to find it.])],
-	[if test "$withval" = yes;then
-		PG_CONFIG="pg_config"
-	else
-		PG_CONFIG="$withval"
-	fi],[PG_CONFIG="pg_config"])
-
-# get the full path
-AC_PATH_PROGS(PG_CONFIG_PATH, ${PG_CONFIG},${PG_CONFIG})
-#AC_MSG_CHECKING(${PG_CONFIG_PATH})
-
-if test ! -f "${PG_CONFIG_PATH}" ;then
-	AC_MSG_ERROR([you must specify a valid pg_config of PostgreSQL installation with --with-pgconf=pg_config])
+if test -z "$PG_CONFIG"; then
+  AC_MSG_ERROR([pg_config not found (set PG_CONFIG environment variable)])
 fi
 
-pg_includedir=`${PG_CONFIG_PATH} --includedir`
-pg_libdir=`${PG_CONFIG_PATH} --libdir`
+pg_includedir=`$PG_CONFIG --includedir`
+pg_libdir=`$PG_CONFIG --libdir`
 CPPFLAGS="$CPPFLAGS -I$pg_includedir"
-LIBS="-L$pg_libdir $LIBS"
+LDFLAGS="$LDFLAGS -L$pg_libdir"
 
 
 AC_CONFIG_FILES([Makefile])
-- 
2.39.5