CVS User Account cvsuser
Fri Oct 27 10:31:54 PDT 2006
Log Message:
-----------
This uses pg_config --sharedir for finding the postgresql.conf.sample 
directory. This will help building slony without extra options on all
installation layouts with PostgreSQL 8.1 and later.

- Per Peter Eisentraut

Tags:
----
REL_1_2_STABLE

Modified Files:
--------------
    slony1-engine/config:
        acx_libpq.m4 (r1.24 -> r1.24.2.1)

-------------- next part --------------
Index: acx_libpq.m4
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/config/acx_libpq.m4,v
retrieving revision 1.24
retrieving revision 1.24.2.1
diff -Lconfig/acx_libpq.m4 -Lconfig/acx_libpq.m4 -u -w -r1.24 -r1.24.2.1
--- config/acx_libpq.m4
+++ config/acx_libpq.m4
@@ -107,6 +107,7 @@
             PG_INCLUDEDIR=$WIN32_PG_LOCATION/include
             PG_PKGLIBDIR=$WIN32_PG_LOCATION/lib
             PG_INCLUDESERVERDIR=$WIN32_PG_LOCATION/include/server
+            PG_SHAREDIR=$WIN32_PG_LOCATION/share
             ;;
         
         *)
@@ -130,6 +131,10 @@
         	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
     



More information about the Slony1-commit mailing list