If pg_config is not found, don't override paths

If pg_config is not found and either --with-pgsql-lib or
--with-pgsql-includes is given, the values are ignored.
Fix this.

diff --git a/m4/pdns_with_postgresql.m4 b/m4/pdns_with_postgresql.m4
index 60d54ffa842f91eb3f4a7e6e2aaece5d293981b1..cbf538ec7d7e1039c706eb6235d943728f294196 100644 (file)
--- a/m4/pdns_with_postgresql.m4
+++ b/m4/pdns_with_postgresql.m4
@@ -42,8 +42,13 @@ AC_DEFUN([PDNS_WITH_POSTGRESQL],[
       PGSQL_inc_check=$($PGSQL_pg_config --includedir)
     fi
     PGSQL_CFLAGS=
-  else
+  fi
+
+  if test "x$PGSQL_lib_check" == "x"; then
     PGSQL_lib_check="/usr/local/pgsql/lib/pgsql /usr/local/lib/pgsql /opt/pgsql/lib/pgsql /usr/lib/pgsql /usr/local/pgsql/lib /usr/local/lib /opt/pgsql/lib /usr/lib /usr/lib64 $full_libdir"
+  fi
+
+  if test "x$PGSQL_inc_check" == "x"; then
     PGSQL_inc_check="/usr/local/pgsql/include/pgsql /usr/include /usr/local/include/postgresql/ /usr/local/include /opt/pgsql/include/pgsql /opt/pgsql/include /usr/include/pgsql/ /usr/include/postgresql"
   fi