[Dirac-commits] compress configure.ac,1.39,1.40

[Anuradha S. <asu...@us...>]

Update of /cvsroot/dirac/compress
In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv15676

Modified Files:
	configure.ac 
Log Message:
Fix bug in setting additional flags in CXXFLAGS to flag extra warnings.


Index: configure.ac
===================================================================
RCS file: /cvsroot/dirac/compress/configure.ac,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** configure.ac	29 Mar 2007 16:07:30 -0000	1.39
--- configure.ac	19 Apr 2007 15:02:15 -0000	1.40
***************
*** 216,238 ****
  )
  
  case "$CXX" in
     g++*)
! 		OPT_CFLAGS=""
! 		TRY_CFLAGS="-g"
! 		AC_TRY_CXXFLAGS([],[], [$TRY_CFLAGS $CXXFLAGS],[OPT_CFLAGS="$OPT_CFLAGS $TRY_CFLAGS"])
! 		TRY_CFLAGS="-pedantic"
! 		AC_TRY_CXXFLAGS([],[], [$TRY_CFLAGS $CXXFLAGS],[OPT_CFLAGS="$OPT_CFLAGS $TRY_CFLAGS"])
! 		TRY_CFLAGS="-Wall"
! 		AC_TRY_CXXFLAGS([],[], [$TRY_CFLAGS $CXXFLAGS],[OPT_CFLAGS="$OPT_CFLAGS $TRY_CFLAGS"])
! 		TRY_CFLAGS="-Werror"
! 		AC_TRY_CXXFLAGS([],[], [$TRY_CFLAGS $CXXFLAGS],[OPT_CFLAGS="$OPT_CFLAGS $TRY_CFLAGS"])
! 		TRY_CFLAGS="-W"
! 		AC_TRY_CXXFLAGS([],[], [$TRY_CFLAGS $CXXFLAGS],[OPT_CFLAGS="$OPT_CFLAGS $TRY_CFLAGS"])
! 		TRY_CFLAGS="-Woverloaded-virtual"
! 		AC_TRY_CXXFLAGS([],[], [$TRY_CFLAGS $CXXFLAGS],[OPT_CFLAGS="$OPT_CFLAGS $TRY_CFLAGS"])
  		#TRY_CFLAGS="-Wno-long-double"
  		#AC_TRY_CXXFLAGS([#include <math.h>],[long double lw;], [$TRY_CFLAGS $CXXFLAGS],[OPT_CFLAGS="$OPT_CFLAGS $TRY_CFLAGS"])
! 		TRY_CFLAGS="-Wextra"
! 		AC_TRY_CXXFLAGS([],[], [$TRY_CFLAGS $CXXFLAGS],[OPT_CFLAGS="$OPT_CFLAGS $TRY_CFLAGS"])
          CXXFLAGS="$OPT_CFLAGS $CXXFLAGS"
  		   ;;
--- 216,239 ----
  )
  
+ AC_LANG_PUSH(C++)
+ OPT_CFLAGS=""
  case "$CXX" in
     g++*)
! 		TRY_CFLAGS="$OPT_CFLAGS -g"
! 		AC_TRY_CXXFLAGS([],[], [$TRY_CFLAGS $CXXFLAGS],[OPT_CFLAGS="$TRY_CFLAGS"])
! 		TRY_CFLAGS="$OPT_CFLAGS -pedantic"
! 		AC_TRY_CXXFLAGS([],[], [$TRY_CFLAGS $CXXFLAGS],[OPT_CFLAGS="$TRY_CFLAGS"])
! 		TRY_CFLAGS="$OPT_CFLAGS -Wall"
! 		AC_TRY_CXXFLAGS([],[], [$TRY_CFLAGS $CXXFLAGS],[OPT_CFLAGS="$TRY_CFLAGS"])
! 		TRY_CFLAGS="$OPT_CFLAGS -Werror"
! 		AC_TRY_CXXFLAGS([],[], [$TRY_CFLAGS $CXXFLAGS],[OPT_CFLAGS="$TRY_CFLAGS"])
! 		TRY_CFLAGS="$OPT_CFLAGS -W"
! 		AC_TRY_CXXFLAGS([],[], [$TRY_CFLAGS $CXXFLAGS],[OPT_CFLAGS="$TRY_CFLAGS"])
! 		TRY_CFLAGS="$OPT_CFLAGS -Woverloaded-virtual"
! 		AC_TRY_CXXFLAGS([],[], [$TRY_CFLAGS $CXXFLAGS],[OPT_CFLAGS="$TRY_CFLAGS"])
  		#TRY_CFLAGS="-Wno-long-double"
  		#AC_TRY_CXXFLAGS([#include <math.h>],[long double lw;], [$TRY_CFLAGS $CXXFLAGS],[OPT_CFLAGS="$OPT_CFLAGS $TRY_CFLAGS"])
! 		TRY_CFLAGS="$OPT_CFLAGS -Wextra"
! 		AC_TRY_CXXFLAGS([],[], [$TRY_CFLAGS $CXXFLAGS],[OPT_CFLAGS="$TRY_CFLAGS"])
          CXXFLAGS="$OPT_CFLAGS $CXXFLAGS"
  		   ;;
***************
*** 244,248 ****
  dnl enable debug flags
  dnl -----------------------------------------------
- AC_LANG_PUSH(C++)
  AC_MSG_CHECKING([whether extra debug flags are to be used when compiling])
  AC_ARG_ENABLE(debug, AC_HELP_STRING([--enable-debug], [enable extra debug flags (no)]),
--- 245,248 ----
***************
*** 255,260 ****
  			OPT_CFLAGS=""
  			TRY_CFLAGS="-O0"
! 			AC_TRY_CXXFLAGS([],[], [$TRY_CFLAGS $CXXFLAGS],[OPT_CFLAGS="$OPT_CFLAGS $TRY_CFLAGS"])
! 			CXXFLAGS="$CXXFLAGS $OPT_CFLAGS -DDIRAC_DEBUG"
  		    ;;
  	    icc)
--- 255,260 ----
  			OPT_CFLAGS=""
  			TRY_CFLAGS="-O0"
! 			AC_TRY_CXXFLAGS([],[], [$TRY_CFLAGS $CXXFLAGS],[OPT_CFLAGS="$TRY_CFLAGS"])
! 			CXXFLAGS="$OPT_CFLAGS $CXXFLAGS -DDIRAC_DEBUG"
  		    ;;
  	    icc)
***************
*** 286,293 ****
  	case "$CXX" in
      g++*|icc)
- 		CXXFLAGS=`echo $CXXFLAGS | sed 's/-O[[0-9]]*//g'`
  		TRY_CFLAGS="-O3"
  		AC_TRY_CXXFLAGS([],[], [$TRY_CFLAGS $CXXFLAGS],[OPT_CFLAGS="$TRY_CFLAGS"])
! 		TRY_CFLAGS="-Wuninitialized"
  		AC_TRY_CXXFLAGS([],[], [$TRY_CFLAGS $CXXFLAGS],[OPT_CFLAGS="$TRY_CFLAGS"])
  		dnl arch specific flags
--- 286,292 ----
  	case "$CXX" in
      g++*|icc)
  		TRY_CFLAGS="-O3"
  		AC_TRY_CXXFLAGS([],[], [$TRY_CFLAGS $CXXFLAGS],[OPT_CFLAGS="$TRY_CFLAGS"])
! 		TRY_CFLAGS="$OPT_CFLAGS -Wuninitialized"
  		AC_TRY_CXXFLAGS([],[], [$TRY_CFLAGS $CXXFLAGS],[OPT_CFLAGS="$TRY_CFLAGS"])
  		dnl arch specific flags