From 7e91e3b9a92c0ba570501ecdc092f551cbc355f1 Mon Sep 17 00:00:00 2001
From: Alejandro Mery <amery@geeks.cl>
Date: Tue, 20 Jan 2004 22:19:36 +0000
Subject: [PATCH] Alejandro Mery <amery@geeks.cl>: php needs to know where to
find postgresql headers. $pkg_postgresql_prefix created for the purpose
git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@2234 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc
---
package/alessandro/php/php.conf | 2 +-
package/michiel/postgresql/postgresql.conf | 4 ++++
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/package/alessandro/php/php.conf b/package/alessandro/php/php.conf
index 8188db004..8d57fab43 100644
--- a/package/alessandro/php/php.conf
+++ b/package/alessandro/php/php.conf
@@ -34,7 +34,7 @@ if [ "$ROCKCFG_PKG_PHP_mysql" = 1 ] ; then
var_append extraconfopt " " "--with-mysql$pkg_php_shared"
fi
-[ "$ROCKCFG_PKG_PHP_postgresql" = 1 ] && var_append extraconfopt " " "--with-pgsql"
+[ "$ROCKCFG_PKG_PHP_postgresql" = 1 ] && var_append extraconfopt " " "--with-pgsql=${pkg_postgresql_prefix}"
[ "$ROCKCFG_PKG_PHP_openldap" = 1 ] && var_append extraconfopt " " "--with-ldap=${pkg_openldap_prefix}"
[ "$ROCKCFG_PKG_PHP_openssl" = 1 ] && var_append extraconfopt " " "--with-openssl"
diff --git a/package/michiel/postgresql/postgresql.conf b/package/michiel/postgresql/postgresql.conf
index 30df31e39..fbe4f60ca 100644
--- a/package/michiel/postgresql/postgresql.conf
+++ b/package/michiel/postgresql/postgresql.conf
@@ -28,3 +28,7 @@ fi
var_append extraconfopt " " "--with-CXX"
var_append extraconfopt " " "--with-gnu-ld"
var_append extraconfopt " " "--with-perl"
+
+# other packages may need to know where postgres is.
+hook_add postmake 3 "echo \"pkg_postgresql_prefix=/$prefix\" \
+ > $root/var/adm/parse-config/postgresql"