[Pkg-cyrus-sasl2-commits] [cyrus-sasl2] 25/44: Add ${with_pgsql}include/postgresql/ to include path

[Ondřej Surý]

This is an automated email from the git hooks/post-receive script.

ondrej pushed a commit to branch master
in repository cyrus-sasl2.

commit 9c898428378640139fb98fb7992765b055125bdf
Author: Ondřej Surý <ondrej at sury.org>
Date:   Tue Oct 25 12:33:34 2016 +0200

    Add ${with_pgsql}include/postgresql/ to include path
---
 ..._pgsql-include-postgresql-to-include-path.patch | 23 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 debian/rules                                       |  2 +-
 3 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/debian/patches/0032-Add-with_pgsql-include-postgresql-to-include-path.patch b/debian/patches/0032-Add-with_pgsql-include-postgresql-to-include-path.patch
new file mode 100644
index 0000000..2dfb178
--- /dev/null
+++ b/debian/patches/0032-Add-with_pgsql-include-postgresql-to-include-path.patch
@@ -0,0 +1,23 @@
+From: =?utf-8?q?Ond=C5=99ej_Sur=C3=BD?= <ondrej at sury.org>
+Date: Tue, 25 Oct 2016 12:33:27 +0200
+Subject: Add ${with_pgsql}include/postgresql/ to include path
+
+---
+ configure.ac | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 7afb96d..3b38803 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -919,7 +919,9 @@ case "$with_pgsql" in
+      LIB_PGSQL_DIR=$LIB_PGSQL
+      LIB_PGSQL="$LIB_PGSQL -lpq"
+ 
+-     if test -d ${with_pgsql}/include/pgsql; then
++     if test -d ${with_pgsql}/include/postgresql/; then
++         CPPFLAGS="${CPPFLAGS} -I${with_pgsql}/include/postgresql"
++     elif test -d ${with_pgsql}/include/pgsql; then
+          CPPFLAGS="${CPPFLAGS} -I${with_pgsql}/include/pgsql"
+      elif test -d ${with_pgsql}/pgsql/include; then
+          CPPFLAGS="${CPPFLAGS} -I${with_pgsql}/pgsql/include"
diff --git a/debian/patches/series b/debian/patches/series
index b29b5f2..5b61ddd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -29,3 +29,4 @@
 0029-Fix-early-hangup-in-ipc_unix.c.patch
 0030-Change-linking-from-sasldb-.libs-libsasldb.al-to-sas.patch
 0031-Cleanup-for-modern-autotools.patch
+0032-Add-with_pgsql-include-postgresql-to-include-path.patch
diff --git a/debian/rules b/debian/rules
index 3849ab9..3e15bfd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -79,7 +79,7 @@ CONFIGURE_COMMON_OPTIONS= \
 	$(CONFIGURE_SQL) \
 	--with-sqlite3=/usr \
 	--with-mysql=/usr \
-	--with-pgsql=/usr/include/postgresql \
+	--with-pgsql=/usr \
 	$(CONFIGURE_LDAPDB) \
 	--disable-macos-framework \
 	--with-pam=/usr \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-cyrus-sasl2/cyrus-sasl2.git