Make template CFLAGS handling consistent.

diff --git a/src/template/aix b/src/template/aix
index 768d38d88dfc3d6ab6a7e4d66882998b828d0a24..bdd7b08cb8d8afb07439d402da9196d3e4781e70 100644 (file)
--- a/src/template/aix
+++ b/src/template/aix
@@ -1,9 +1,9 @@
 if test "$GCC" = yes ; then
-  CFLAGS='-O2 -pipe'
-else # not GCC
-  CFLAGS='-O2 -qmaxmem=16384 -qsrcmsg -qlonglong'
+  CFLAGS="$CFLAGS -pipe"
+else
   case $host_os in
-    aix3.2.5 | aix4.1*)
-      CFLAGS='-qmaxmem=16384 -qsrcmsg' ;;
+    aix3.2.5 | aix4.1*) ;;
+    *) CFLAGS="$CFLAGS -O2 -qlonglong";;
   esac
-fi # not GCC
+  CFLAGS="$CFLAGS -qmaxmem=16384 -qsrcmsg"
+fi

diff --git a/src/template/cygwin b/src/template/cygwin
index 8a9fa0051eacb459cd0b6694fb18e48d27fbcc30..9b342ba8ab5094e504f4bc1577747b27d7f54609 100644 (file)
--- a/src/template/cygwin
+++ b/src/template/cygwin
@@ -1 +1 @@
-SRCH_LIB='/usr/local/lib'
+SRCH_LIB="/usr/local/lib"

diff --git a/src/template/freebsd b/src/template/freebsd
index 6780a8ed472653c11b73ab469abd8c94fa51f9fe..fd9b3b96d5a8bd032503f244a7ea09570b214839 100644 (file)
--- a/src/template/freebsd
+++ b/src/template/freebsd
@@ -1,7 +1,7 @@
 CFLAGS="$CFLAGS -pipe"
 
 case $host_cpu in
-  alpha*)   CFLAGS="$CFLAGS -O";;
+  alpha*)   CFLAGS="$CFLAGS -O";;  # alpha has problems with -O2
 esac
 
 THREAD_SUPPORT=yes

diff --git a/src/template/hpux b/src/template/hpux
index 28d836e0120483cd3721efb76f87fff14ee4ebf1..a461df0dcd759effb34a58c3642d135beb977beb 100644 (file)
--- a/src/template/hpux
+++ b/src/template/hpux
@@ -2,5 +2,5 @@ CPPFLAGS="-D_XOPEN_SOURCE_EXTENDED"
 
 if test "$GCC" != yes ; then
   CC="$CC -Ae"
-  CFLAGS="+O2"
+  CFLAGS="$CFLAGS +O2"
 fi

diff --git a/src/template/osf b/src/template/osf
index 133a4516ab00b9682ce746b853ad4f8defe590ce..2b4dee1546b3f23e654b21cf6d2baaf97a47b034 100644 (file)
--- a/src/template/osf
+++ b/src/template/osf
@@ -1,6 +1,6 @@
 if test "$GCC" != yes ; then
   CC="$CC -std"
-  CFLAGS='-O4 -Olimit 2000'
+  CFLAGS="$CFLAGS -O4 -Olimit 2000"
 fi
 
 THREAD_SUPPORT=yes

diff --git a/src/template/solaris b/src/template/solaris
index f5ff36064bebc2c91730ed535edadb7f6058aeda..5264f749859522d32b547243bc3f1e6f85c4351a 100644 (file)
--- a/src/template/solaris
+++ b/src/template/solaris
@@ -1,6 +1,6 @@
 if test "$GCC" != yes ; then
   CC="$CC -Xa"                 # relaxed ISO C mode
-  CFLAGS="-O -v"               # -v is like gcc -Wall
+  CFLAGS="$CFLAGS -O -v"       # -v is like gcc -Wall
 fi
 
 THREAD_SUPPORT=yes

diff --git a/src/template/univel b/src/template/univel
index d48aa7c3111570f58a1aa29a35b1dba242c4983b..12d11496735c568166808636f37d3b6ab1500bd0 100644 (file)
--- a/src/template/univel
+++ b/src/template/univel
@@ -1,2 +1,2 @@
-CFLAGS='-v -O -K i486,host,inline,loop_unroll -Dsvr4'
+CFLAGS="$CFLAGS -v -O -K i486,host,inline,loop_unroll -Dsvr4"
 LIBS="-lc89"

diff --git a/src/template/unixware b/src/template/unixware
index cb1381d8fbd48987a7f10911223049004ac88335..8ad4a745d2e87b8e2e2aa4a7cb21ef2cdb0488ef 100644 (file)
--- a/src/template/unixware
+++ b/src/template/unixware
@@ -4,7 +4,7 @@ else
 # the -Kno_host is temporary for a bug in the compiler.  See -hackers
 # discussion on 7-8/Aug/2003.
 # when the 7.1.3UP3 or later compiler is out, we can do a version check.
-  CFLAGS='-O -Kinline,no_host'
+  CFLAGS="$CFLAGS -O -Kinline,no_host"
   THREAD_CPPFLAGS="-K pthread"
 fi