Pass C++ compiler to libcutl dist.sh; cosmetic changes

1 files changed, 14 insertions, 15 deletions

diff --git a/dist.sh b/dist.sh
index 64710a9..6c0ecb3 100755
--- a/dist.sh
+++ b/dist.sh
@@ -1,6 +1,6 @@
 #! /usr/bin/env bash
 
-# Create ODB source distributions
+# Create ODB source distributions.
 #
 # -rebuild
 # -complete  package/build libcutl and the ODB compiler; implies -rebuild
@@ -47,8 +47,7 @@ db=
 odb=$src_root/odb/odb/odb
 cxx=g++
 cxxp=g++-4.5
-
-CXXFLAGS="-W -Wall -Wno-unknown-pragmas -O3"
+cxxflags="-W -Wall -Wno-unknown-pragmas -O3"
 
 mysql_options=
 mysql_test_options=
@@ -201,7 +200,7 @@ mkdir -p $out_root/pack
 #
 if [ $complete = y ]; then
   cd $src_root/../cutl
-  ./dist.sh $out_root/libcutl
+  ./dist.sh -cxx "$cxxp" -out "$out_root/libcutl"
   cd $wd
 fi
 
@@ -214,7 +213,7 @@ dist dist_prefix=$out_root/odb
   cd $out_root/odb
 
   ./bootstrap
-  ./configure --with-libcutl=../libcutl CXX="$cxxp" CXXFLAGS="$CXXFLAGS"
+  ./configure --with-libcutl=../libcutl CXX="$cxxp" CXXFLAGS="$cxxflags"
 
   make -j 8
   make dist
@@ -237,7 +236,7 @@ cd $out_root/libodb
 
 if [ $rebuild = y ]; then
   ./bootstrap
-  ./configure CXX="$cxx" CXXFLAGS="$CXXFLAGS"
+  ./configure CXX="$cxx" CXXFLAGS="$cxxflags"
 fi
 
 make -j 8
@@ -260,7 +259,7 @@ if [ $rebuild = y ]; then
   ./bootstrap
   ./configure --with-libodb=../libodb \
               CXX="$cxx" \
-              CXXFLAGS="$CXXFLAGS" \
+              CXXFLAGS="$cxxflags" \
               $mssql_options
 fi
 
@@ -284,7 +283,7 @@ if [ $rebuild = y ]; then
   ./bootstrap
   ./configure --with-libodb=../libodb \
               CXX="$cxx" \
-              CXXFLAGS="$CXXFLAGS" \
+              CXXFLAGS="$cxxflags" \
               $oracle_options
 fi
 
@@ -308,7 +307,7 @@ if [ $rebuild = y ]; then
   ./bootstrap
   ./configure --with-libodb=../libodb \
               CXX="$cxx" \
-              CXXFLAGS="$CXXFLAGS" \
+              CXXFLAGS="$cxxflags" \
               $pgsql_options
 fi
 
@@ -332,7 +331,7 @@ if [ $rebuild = y ]; then
   ./bootstrap
   ./configure --with-libodb=../libodb \
               CXX="$cxx" \
-              CXXFLAGS="$CXXFLAGS" \
+              CXXFLAGS="$cxxflags" \
               $sqlite_options
 fi
 
@@ -356,7 +355,7 @@ if [ $rebuild = y ]; then
   ./bootstrap
   ./configure --with-libodb=../libodb \
               CXX="$cxx" \
-              CXXFLAGS="$CXXFLAGS" \
+              CXXFLAGS="$cxxflags" \
               $mysql_options
 fi
 
@@ -378,7 +377,7 @@ cd $out_root/libodb-boost
 
 if [ $rebuild = y ]; then
   ./bootstrap
-  ./configure --with-libodb=../libodb CXX="$cxx" CXXFLAGS="$CXXFLAGS"
+  ./configure --with-libodb=../libodb CXX="$cxx" CXXFLAGS="$cxxflags"
 fi
 
 make -j 8
@@ -399,7 +398,7 @@ cd $out_root/libodb-qt
 
 if [ $rebuild = y ]; then
   ./bootstrap
-  ./configure --with-libodb=../libodb CXX="$cxx" CXXFLAGS="$CXXFLAGS"
+  ./configure --with-libodb=../libodb CXX="$cxx" CXXFLAGS="$cxxflags"
 fi
 
 make -j 8
@@ -441,7 +440,7 @@ for d in $db; do
 --with-libodb-qt=../libodb-qt \
 ${!optvar} \
 CXX="$cxx" \
-CXXFLAGS="$CXXFLAGS" \
+CXXFLAGS="$cxxflags" \
 ODB=$odb
   fi
 
@@ -492,7 +491,7 @@ for d in $db; do
 --with-libodb-qt=../libodb-qt \
 ${!optvar} \
 CXX="$cxx" \
-CXXFLAGS="$CXXFLAGS" \
+CXXFLAGS="$cxxflags" \
 ODB=$odb
   fi