Make template CFLAGS handling consistent.

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

src/template/cygwin

@@ -1 +1 @@
-SRCH_LIB='/usr/local/lib'
+SRCH_LIB="/usr/local/lib"

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

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

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

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

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"

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