Commit4f47538

committed

Move CXX platform-specific stuff into template files.

1 parent712f69e commit4f47538Copy full SHA for 4f47538

File tree

+16

-14

lines changed

+16

-14

lines changed

Lines changed: 6 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -1916,6 +1916,10 @@ echo "$as_me: error: argument required for --with-CC option" >&2;}`
`1916`	`1916`	`fi;`
`1917`	`1917`
`1918`	`1918`
	`1919`	`+# Set here so it can be over-ridden in the template file`
	`1920`	`+GCC_CXXFLAGS="-O2"`
	`1921`	`+VENDOR_CXXFLAGS=""`
	`1922`	`+`
`1919`	`1923`	`case$templatein`
`1920`	`1924`	`aix) pgac_cc_list="gcc xlc";;`
`1921`	`1925`	`irix) pgac_cc_list="cc";;# no gcc`
`@@ -4043,13 +4047,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu`
`4043`	`4047`
`4044`	`4048`	`iftest"$ac_env_CXXFLAGS"!=set;then`
`4045`	`4049`	`iftest"$GXX" = yes;then`
`4046`		`- CXXFLAGS=-O2`
	`4050`	`+ CXXFLAGS="$GCC_CXXFLAGS"`
`4047`	`4051`	`else`
`4048`		`-case$templatein`
`4049`		`-osf)CXXFLAGS='-O4 -Olimit 2000' ;;`
`4050`		`- unixware)CXXFLAGS='-O' ;;`
`4051`		`-*)CXXFLAGS= ;;`
`4052`		`-esac`
	`4052`	`+ CXXFLAGS="$VENDOR_CXXFLAGS"`
`4053`	`4053`	`fi`
`4054`	`4054`	`fi`
`4055`	`4055`	`iftest"$enable_debug" = yes&&test"$ac_cv_prog_cxx_g" = yes;then`

Lines changed: 7 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`dnl Process this file with autoconf to produce a configure script.`
`2`		`-dnl $Header: /cvsroot/pgsql/configure.in,v 1.186 2002/05/28 16:57:53 petere Exp $`
	`2`	`+dnl $Header: /cvsroot/pgsql/configure.in,v 1.187 2002/07/07 20:28:24 momjian Exp $`
`3`	`3`	`dnl`
`4`	`4`	`dnl Developers, please strive to achieve this order:`
`5`	`5`	`dnl`
`@@ -243,6 +243,10 @@ AC_SUBST(enable_debug)`
`243`	`243`	`# variable.`
`244`	`244`	`PGAC_ARG_REQ(with, CC, [], [CC=$with_CC])`
`245`	`245`
	`246`	`+# Set here so it can be over-ridden in the template file`
	`247`	`+GCC_CXXFLAGS="-O2"`
	`248`	`+VENDOR_CXXFLAGS=""`
	`249`	`+`
`246`	`250`	`case $template in`
`247`	`251`	`aix) pgac_cc_list="gcc xlc";;`
`248`	`252`	`irix) pgac_cc_list="cc";; # no gcc`
`@@ -593,13 +597,9 @@ PGAC_ARG_OPTARG(with, CXX, [ --with-CXX build C++ modules (libpq++`
`593`	`597`	`AC_PROG_CXX`
`594`	`598`	`if test "$ac_env_CXXFLAGS" != set; then`
`595`	`599`	`if test "$GXX" = yes; then`
`596`		`- CXXFLAGS=-O2`
	`600`	`+ CXXFLAGS="$GCC_CXXFLAGS"`
`597`	`601`	`else`
`598`		`- case $template in`
`599`		`-osf)CXXFLAGS='-O4 -Olimit 2000' ;;`
`600`		`- unixware)CXXFLAGS='-O' ;;`
`601`		`-*)CXXFLAGS= ;;`
`602`		`- esac`
	`602`	`+ CXXFLAGS="$VENDOR_CXXFLAGS"`
`603`	`603`	`fi`
`604`	`604`	`fi`
`605`	`605`	`if test "$enable_debug" = yes && test "$ac_cv_prog_cxx_g" = yes; then`

Lines changed: 1 addition & 1 deletion

Lines changed: 1 addition & 0 deletions

Lines changed: 1 addition & 0 deletions

Comments

(0)