Wed Nov 29 10:44:37 PST 2006
- Previous message: [Slony1-commit] By cbbrowne: Fixes to altperl tools that are supposed to do STORE PATH -
- Next message: [Slony1-commit] By xfade: If PostgreSQL version is 8.1 or greater, we can use pg_config
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Log Message:
-----------
If PostgreSQL version is 8.1 or greater, we can use pg_config --sharedir. Otherwise we will resort to the default guessing mode.
Modified Files:
--------------
slony1-engine/config:
acx_libpq.m4 (r1.26 -> r1.27)
-------------- next part --------------
Index: acx_libpq.m4
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/config/acx_libpq.m4,v
retrieving revision 1.26
retrieving revision 1.27
diff -Lconfig/acx_libpq.m4 -Lconfig/acx_libpq.m4 -u -w -r1.26 -r1.27
--- config/acx_libpq.m4
+++ config/acx_libpq.m4
@@ -131,10 +131,6 @@
PG_INCLUDESERVERDIR=`$PG_CONFIG_LOCATION --includedir-server`/
echo "pg_config says pg_includeserverdir is $PG_INCLUDESERVERDIR"
fi
- if test "$PG_SHAREDIR" = ""; then
- PG_SHAREDIR=`$PG_CONFIG_LOCATION --sharedir`/ 2>/dev/null
- echo "pg_config says pg_sharedir is $PG_SHAREDIR"
- fi
;;
esac
@@ -160,6 +156,16 @@
AC_MSG_RESULT($PG_VERSION)
AC_DEFINE(PG_VERSION_OK,1,[PostgreSQL 7.4 or later])
fi
+
+ if test "$PG_VERSION_MAJOR" = "8"; then
+ if test $PG_VERSION_MINOR -gt 0; then
+ if test "$PG_SHAREDIR" = ""; then
+ PG_SHAREDIR=`$PG_CONFIG_LOCATION --sharedir`/ 2>/dev/null
+ echo "pg_config says pg_sharedir is $PG_SHAREDIR"
+ fi
+ fi
+ fi
+
case ${host_os} in
aix*|*solaris*)
AC_MSG_CHECKING(PostgreSQL for enable-thread-safety as required on ${host_os})
- Previous message: [Slony1-commit] By cbbrowne: Fixes to altperl tools that are supposed to do STORE PATH -
- Next message: [Slony1-commit] By xfade: If PostgreSQL version is 8.1 or greater, we can use pg_config
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
More information about the Slony1-commit mailing list