Mercurial > dovecot > original-hg > dovecot-1.2
changeset 9231:71242a8c2dff HEAD
configure: Use pg_config for figuring out PostgreSQL include/libs paths.
pg_config has existsed since v7.1, so don't bother using any fallbacks.
author | Timo Sirainen <tss@iki.fi> |
---|---|
date | Fri, 17 Jul 2009 17:13:51 -0400 |
parents | 2bb46e1c0f53 |
children | f57f9dab059b |
files | configure.in |
diffstat | 1 files changed, 11 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/configure.in Wed Jul 15 16:09:09 2009 -0400 +++ b/configure.in Fri Jul 17 17:13:51 2009 -0400 @@ -1958,25 +1958,19 @@ fi if test $want_pgsql != no; 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 - 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 + # pg_config exists since 7.1, don't bother with older versions + AC_CHECK_PROG(PG_CONFIG, pg_config, YES, NO) + if test $PG_CONFIG = NO; then + if test $want_pgsql = yes; then + AC_ERROR([Can't build with PostgreSQL support: pg_config not found]) + fi + else + PGSQL_INCLUDE="`pg_config --includedir`" + PGSQL_LIBDIR="`pg_config --libdir`" old_LIBS=$LIBS if test "$PGSQL_LIBDIR" != ""; then - LIBS="$LIBS -L$PGSQL_LIBDIR" + LIBS="$LIBS -L$PGSQL_LIBDIR" fi AC_CHECK_LIB(pq, PQconnectdb, [ @@ -2013,6 +2007,7 @@ fi ]) LIBS=$old_LIBS + fi fi if test $want_mysql != no; then