From: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date: Fri, 26 Dec 2014 16:01:06 +0000 (+0100)
Subject: If pg_config is not found, don't override paths
X-Git-Tag: rec-3.7.0-rc1~60^2~1^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c9efa27806a4783cfc2f65e2b51b8d916615e8b4;p=thirdparty%2Fpdns.git

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 60d54ffa84..cbf538ec7d 100644
--- 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