From e94f297ba3113872cb4be889c0858e12b57ae2ab Mon Sep 17 00:00:00 2001
From: Alexandre Duret-Lutz <adl@lrde.epita.fr>
Date: Mon, 9 Aug 2004 09:14:15 +0000
Subject: [PATCH] * m4/gccoptim.m4: Compute optimization flags for CXX too.

---
 ChangeLog      |  2 ++
 m4/gccoptim.m4 | 28 ++++++++++++++++++++++++++--
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4fe0c5fce..7e3aa2e6d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2004-08-09  Alexandre Duret-Lutz  <adl@src.lip6.fr>
 
+	* m4/gccoptim.m4: Compute optimization flags for CXX too.
+
 	* m4/ndebug.m4: Update CPPFLAGS, not CFLAGS.
 
 	* src/tgbaalgos/ltl2tgba_fm.hh (ltl_to_tgba_fm): Document all
diff --git a/m4/gccoptim.m4 b/m4/gccoptim.m4
index 44c3ebfd3..f2d844db0 100644
--- a/m4/gccoptim.m4
+++ b/m4/gccoptim.m4
@@ -3,7 +3,7 @@ AC_DEFUN([ad_GCC_OPTIM],
 [AC_ARG_ENABLE([optimizations],
  [AC_HELP_STRING([--disable-optimizations],
   [turn off aggressive optimizations])])
- if test -n "$GCC" -a "${enable_optimizations-yes}" = "yes"; then
+ if test -n "$GCC" && test "${enable_optimizations-yes}" = "yes"; then
   AC_CACHE_CHECK([for gcc optimization options], ac_cv_prog_gcc_opt_flags,
   [changequote(,)dnl
   cat > conftest.$ac_ext <<EOF
@@ -25,9 +25,33 @@ EOF
   done
   rm -f conftest*
   CFLAGS="$cf_save_CFLAGS $ac_cv_prog_gcc_opt_flags"])
+  AC_CACHE_CHECK([for g++ optimization options], ac_cv_prog_gxx_opt_flags,
+  [changequote(,)dnl
+  cat > conftest.$ac_ext <<EOF
+#line __oline__ "configure"
+int main(int argc, char *argv[]) { return argv[argc-1] == 0; }
+EOF
+  changequote([,])dnl
+  AC_LANG_PUSH([C++])
+  cf_save_CXXFLAGS="$CXXFLAGS"
+  ac_cv_prog_gxx_opt_flags="-O3"
+  for cf_opt in \
+    ffast-math \
+    fstrict-aliasing \
+    fomit-frame-pointer
+  do
+    CXXFLAGS="$cf_save_CXXFLAGS $ac_cv_prog_gxx_opt_flags -$cf_opt"
+    if AC_TRY_EVAL([ac_compile]); then
+      ac_cv_prog_gxx_opt_flags="$ac_cv_prog_gxx_opt_flags -$cf_opt"
+    fi
+  done
+  rm -f conftest*
+  AC_LANG_POP([C++])
+  CXXFLAGS="$cf_save_CFLAGS $ac_cv_prog_gxx_opt_flags"])
 else
   case $enable_optimizations in
     no) ;;
-    *) CFLAGS="$CFLAGS $enable_optimizations" ;;
+    *) CXXFLAGS="$CXXFLAGS $enable_optimizations"
+       CFLAGS="$CFLAGS $enable_optimizations" ;;
   esac
 fi])