X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fconfig%2Fsubs.m4;h=e1fc1e6e688266f31676652ad51991e5ff2d0db2;hb=1307fe1c1b6737b857b902a0e39141ba96adf025;hp=c5b5a43ff741415795330a10e81f4dcf8df27885;hpb=16b3beced25134bef064705568ecb893a6be4e79;p=synfig.git

diff --git a/synfig-core/trunk/config/subs.m4 b/synfig-core/trunk/config/subs.m4
index c5b5a43..e1fc1e6 100644
--- a/synfig-core/trunk/config/subs.m4
+++ b/synfig-core/trunk/config/subs.m4
@@ -96,24 +96,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 +194,7 @@ AC_DEFUN([AC_ARG_LICENSE_KEY],
 		AC_DEFINE(LICENSE_KEY_REQUIRED,, [ Enables license key checks ] )
 	],
 	[
+		license_key=no
 	])
 ])