Use pg_config to find libpq.

diff --git a/Makefile.am b/Makefile.am
index a4e5e97b1a243d5011c6283d2ef1b3097d705bcd..3d27814b0bd8d7cdd43ee4b0132055e71135cb0e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@
 #
 # Makefile.am for psqlodbc (PostgreSQL ODBC driver)
 #
-# $Header: /home/heikki/psqlodbc-cvs-copy/psqlodbc/Makefile.am,v 1.25 2005/09/19 13:31:58 anoop Exp $
+# $Header: /home/heikki/psqlodbc-cvs-copy/psqlodbc/Makefile.am,v 1.26 2005/10/12 08:12:30 petere Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -12,6 +12,8 @@ lib_LTLIBRARIES = psqlodbc.la
 
 psqlodbc_la_LDFLAGS = -module -no-undefined -avoid-version
 
+psqlodbc_la_LIBADD = -lpq
+
 psqlodbc_la_SOURCES = \
    info.c bind.c columninfo.c connection.c convert.c drvconn.c \
    environ.c execute.c win_md5.c misc.c options.c \

diff --git a/configure.ac b/configure.ac
index b85849c274d6c65a26b65451b144a285f93d2e86..e9ab46b211df4d9b15e385a1428f416f3f72d48c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -118,91 +118,19 @@ AC_C_CONST
 AC_TYPE_SIZE_T\r
 AC_STRUCT_TM\r
 \r
-
-#\r
-#Options for pgsql headers and libraries\r
-#\r
-
-AC_MSG_CHECKING(for pgsql include files)\r
-AC_ARG_WITH(pgsql-include,\r
-[  --with-pgsql-include=DIR  Look for postgreSQL include files in DIR],\r
-[if test "$withval" != no; then\r
-     AC_MSG_RESULT(yes)\r
-     pgsql_include="$withval"\r
-else\r
-     AC_MSG_RESULT(no)\r
-     AC_MSG_ERROR([you must specify a directory when using --with-pgsql-include=DIR])\r
-fi])\r
 \r
 #\r
-# Library directories\r
+# Find libpq headers and libraries\r
 #\r
-AC_MSG_CHECKING(for pgsql)\r
-AC_ARG_WITH(pgsql,\r
-[  --with-pgsql=DIR        look for PostgreSQL libraries and headers in DIR],\r
-[if test "$withval" != no\r
-then\r
-     AC_MSG_RESULT(yes)\r
-     LIBPQ_HOME="$withval"\r
-else\r
-     AC_MSG_RESULT(no)\r
-fi], [\r
-AC_MSG_RESULT(yes)\r
-LIBPQ_HOME="/usr/local/pgsql"\r
-if test "$pgsql_include" = ""\r
-then\r
-     if test ! -f "${LIBPQ_HOME}/include/libpq-fe.h"\r
-     then\r
-          LIBPQ_HOME=/usr/local\r
-          if test ! -f "${LIBPQ_HOME}/include/libpq-fe.h"\r
-          then\r
-               LIBPQ_HOME=/usr\r
-          fi\r
-      fi\r
-      if test -f "/usr/include/libpq-fe.h"\r
-      then\r
-           pgsql_include="/usr/include"\r
-      else\r
-           if test -f "/usr/include/pgsql/libpq-fe.h"\r
-           then\r
-                pgsql_include="/usr/include/pgsql"\r
-            fi\r
-      fi\r
+AC_PATH_PROGS(PG_CONFIG, pg_config)\r
+if test -z "$PG_CONFIG" ; then\r
+  AC_MSG_ERROR([pg_config not found])\r
 fi\r
-   ])\r
-#\r
-# Check for libpq libraries and headers\r
-#\r
-if test -n "${LIBPQ_HOME}"\r
-then\r
-    OLD_LDFLAGS="$LDFLAGS"\r
-    OLD_CPPFLAGS="$CPPFLAGS"\r
-    LDFLAGS="$LDFLAGS -L${LIBPQ_HOME}/lib"\r
-    AC_CHECK_LIB(pq, PQexec, [pgsql_cv_libpq=yes], [pgsql_cv_libpq=no])\r
-\r
-    if test "$pgsql_include" != ""\r
-    then\r
-         CPPFLAGS="$CPPFLAGS -I${pgsql_include}"\r
-    else\r
-         CPPFLAGS="$CPPFLAGS -I${LIBPQ_HOME}/include"\r
-    fi\r
-    AC_CHECK_HEADER(libpq-fe.h, [pgsql_cv_libpqfe_h=yes], [pgsql_cv_libpqfe_h=no])\r
-\r
-    if test "$pgsql_cv_libpq" = "yes" -a "$pgsql_cv_libpqfe_h" = "yes"\r
-    then\r
-         AC_MSG_CHECKING(pgsql in ${LIBPQ_HOME})\r
-         AC_MSG_RESULT(ok)\r
-    else\r
-         AC_MSG_CHECKING(pgsql in ${LIBPQ_HOME})\r
-         AC_MSG_RESULT(failed)\r
-         LDFLAGS="$OLD_LDFLAGS"\r
-         CPPFLAGS="$OLD_CPPFLAGS"\r
-         AC_MSG_ERROR([you must specify a valid pgsql installation with --with-pgsql=DIR])\r
-    fi\r
-    LIBS="$LIBS -lpq"\r
-    CPPFLAGS="$CPPFLAGS "\r
+pg_includedir=`$PG_CONFIG --includedir`\r
+pg_libdir=`$PG_CONFIG --libdir`\r
+CPPFLAGS="$CPPFLAGS -I$pg_includedir"\r
+LDFLAGS="$LDFLAGS -L$pg_libdir"\r
 \r
-fi\r
 \r
 AC_CONFIG_FILES([Makefile])\r
 AC_OUTPUT\r