Reinstate the -Wno-unused-parameter flag, because when building a non-debug build...

[synfig.git] / synfig-core / trunk / config / subs.m4

diff --git a/synfig-core/trunk/config/subs.m4 b/synfig-core/trunk/config/subs.m4
index c5b5a43..571ffd3 100644 (file)
--- a/synfig-core/trunk/config/subs.m4
+++ b/synfig-core/trunk/config/subs.m4
@@ -16,6 +16,7 @@ AC_DEFUN([AC_ARG_WARNINGS],
 
   gtkmm_warning_flags=''
 
+  # -W is now known as -Wextra, but that's not known by gcc 2 or 3
   case "$gtkmm_enable_warnings" in
     none|no)     gtkmm_warning_flags='';;
     minimum|yes) gtkmm_warning_flags='-Wall -Wno-unused-parameter';;
@@ -96,24 +97,25 @@ AC_DEFUN([AC_ARG_DEBUG],
 
 
 
+## Optimisation level 2 in g++ 4.1 or g++ 4.2 breaks composition loading in the vector parsing function in loadcanvas.cpp (1509627)
 AC_DEFUN([AC_ARG_OPTIMIZATION],
 [
        AC_MSG_CHECKING([for optimization flags])
 
-       AC_ARG_ENABLE(optimization,[  --enable-optimization=[[0,1,2,3,4]] Select optimization level (default=2)],[
+       AC_ARG_ENABLE(optimization,[  --enable-optimization=[[0,1,2,3,4]] Select optimization level (default=1)],[
                optimization=$enableval
        ],[
-               optimization="2"
+               optimization="1"
        ])
        optimization_flags=''
        case "$optimization" in
                0|no)   optimization_flags="-O0";;
-               1)              optimization_flags="-O1 -ffast-math";;
-               2|yes)  optimization_flags="-O2 -ffast-math";;
-               pass1)  optimization_flags="-O2 -ffast-math -fprofile-arcs";;
-               pass2)  optimization_flags="-O2 -ffast-math -fbranch-probabilities";;
-               3)              optimization_flags="-O3 -ffast-math";;
-               *)              optimization_flags="-O4 -ffast-math";;
+               1)              optimization_flags="-O1";;
+               2|yes)  optimization_flags="-O2";;
+               pass1)  optimization_flags="-O2 -fprofile-arcs";;
+               pass2)  optimization_flags="-O2 -fbranch-probabilities";;
+               3)              optimization_flags="-O3";;
+               *)              optimization_flags="-O4";;
        esac
        CXXFLAGS="`echo $CXXFLAGS | sed 's:-O.::g'` $optimization_flags"
        CFLAGS="`echo $CFLAGS | sed 's:-O.::g'` $optimization_flags"
@@ -193,6 +195,7 @@ AC_DEFUN([AC_ARG_LICENSE_KEY],
                AC_DEFINE(LICENSE_KEY_REQUIRED,, [ Enables license key checks ] )
        ],
        [
+               license_key=no
        ])
 ])