postgres-xc-committers Mailing List for Postgres-XC

Project "Postgres-XC: write-scalable synchronous multi-master PostgreSQL cluster".

The branch, master has been updated
       via  ebcf8ba26b55a522b1a3e320064a35338edca83d (commit)
      from  646c894d6e5c6a9fc53802f022c3f8cf147f82ed (commit)


- Log -----------------------------------------------------------------
commit ebcf8ba26b55a522b1a3e320064a35338edca83d
Author: Mason S <mas...@ma...>
Date:   Fri May 14 13:38:45 2010 -0400

    By default have configure set CFLAGS to use -DPGXC, which is required
    for Postgres-XC to compile.
    
    genbki.sh is changed to assume this is set, but will now check for -UPGXC
    in case the user wanted to override this.

diff --git a/configure b/configure
index 650799a..503ef2a 100755
--- a/configure
+++ b/configure
@@ -30,7 +30,8 @@ esac
 
 fi
 
-
+# For PGXC, set -DPGXC by default. This can be overriden with -UPGXC if the user sets it.
+CFLAGS="$CFLAGS -DPGXC"
 
 
 # PATH needs CR
diff --git a/src/backend/catalog/genbki.sh b/src/backend/catalog/genbki.sh
index 429d254..e3779be 100644
--- a/src/backend/catalog/genbki.sh
+++ b/src/backend/catalog/genbki.sh
@@ -23,6 +23,7 @@
 : ${AWK='awk'}
 
 CMDNAME=`basename $0`
+DIRNAME=`dirname $0`
 
 INCLUDE_DIRS=
 OUTPUT_PREFIX=
@@ -143,12 +144,13 @@ touch ${OUTPUT_PREFIX}.shdescription.$$
 #	Also handle #ifdef PGXC to preprocess header files.
 # ----------------
 #
-#See if PGXC is defined in CFLAGS
-PGXCdefined=0
-echo $CFLAGS | grep "\-DPGXC" >/dev/null
+#See if PGXC is undefined (assume it is defined by default)
+PGXCdefined=1
+#echo $CFLAGS | grep "\-UPGXC" >/dev/null
+grep "\-UPGXC" $DIRNAME/../../Makefile.global >/dev/null
 if [ $? -eq 0 ]
 then
-	PGXCdefined=1
+	PGXCdefined=0
 fi
 cat $INFILES | \
 $AWK '

-----------------------------------------------------------------------

Summary of changes:
 configure                     |    3 ++-
 src/backend/catalog/genbki.sh |   10 ++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
Postgres-XC: write-scalable synchronous multi-master PostgreSQL cluster