michael@237: Index: configure.in michael@609: --- configure.in.orig 2012-04-23 14:35:10.000000000 +0200 michael@609: +++ configure.in 2012-04-29 19:55:10.000000000 +0200 michael@609: @@ -2122,14 +2122,14 @@ michael@608: AC_CHECK_PROG(PG_CONFIG, pg_config, pg_config, NO) michael@237: if test $PG_CONFIG = NO; then michael@237: # based on code from PHP michael@237: - for i in /usr /usr/local /usr/local/pgsql; do michael@237: - for j in include include/pgsql include/postgres include/postgresql ""; do michael@237: + for i in @l_prefix@; do michael@237: + for j in include/postgresql; do michael@237: if test -r "$i/$j/libpq-fe.h"; then michael@237: PGSQL_INCLUDE=$i/$j michael@237: fi michael@237: done michael@237: - for lib in lib lib64; do michael@237: - for j in $lib $lib/pgsql $lib/postgres $lib/postgresql ""; do michael@237: + for lib in lib; do michael@237: + for j in $lib; do michael@237: if test -f "$i/$j/libpq.so" || test -f "$i/$j/libpq.a"; then michael@237: PGSQL_LIBDIR=$i/$j michael@237: fi michael@204: Index: configure michael@609: --- configure.orig 2012-04-23 14:35:52.000000000 +0200 michael@609: +++ configure 2012-04-29 19:55:11.000000000 +0200 michael@609: @@ -22919,14 +22919,14 @@ michael@204: michael@237: if test $PG_CONFIG = NO; then michael@237: # based on code from PHP michael@237: - for i in /usr /usr/local /usr/local/pgsql; do michael@237: - for j in include include/pgsql include/postgres include/postgresql ""; do michael@237: + for i in @l_prefix@; do michael@237: + for j in include/postgresql; do michael@237: if test -r "$i/$j/libpq-fe.h"; then michael@237: PGSQL_INCLUDE=$i/$j michael@237: fi michael@237: done michael@237: - for lib in lib lib64; do michael@237: - for j in $lib $lib/pgsql $lib/postgres $lib/postgresql ""; do michael@237: + for lib in lib; do michael@237: + for j in $lib; do michael@237: if test -f "$i/$j/libpq.so" || test -f "$i/$j/libpq.a"; then michael@237: PGSQL_LIBDIR=$i/$j michael@237: fi