- drop wrong CPPFLAGS usage and whole -O manipulation

Changed files:
    ascal-optimization.patch -> 1.2

diff --git a/ascal-optimization.patch b/ascal-optimization.patch
index 2ec6573e2bce552b38710438a0bca0c7869c7152..7cabdea08418f33e60458ec4c72c526558fa275a 100644 (file)
--- a/ascal-optimization.patch
+++ b/ascal-optimization.patch
@@ -1,11 +1,24 @@
---- ascal-0.1.1/configure.ac   2006-12-30 01:54:39.000000000 +0100
-+++ ascal-0.1.1/configure.ac-new       2007-11-01 01:41:27.417445220 +0100
-@@ -65,7 +65,7 @@
-         CPPFLAGS="$CPPFLAGS -g -O0"
- else
-     CPPFLAGS=[`echo "$CXXFLAGS" | $SED -e 's/-O[0-9]*//g'`]
+--- ascal-0.1.1/configure.ac.orig      2006-12-30 01:54:39.000000000 +0100
++++ ascal-0.1.1/configure.ac   2008-01-05 16:52:13.008151938 +0100
+@@ -61,11 +61,7 @@
+ 
+ if test "$enable_debug" = yes; then
+         AC_DEFINE(DEBUG, 1, [Enable debug msg.])
+-              CPPFLAGS=[`echo "$CXXFLAGS" | $SED -e 's/-O[0-9]*//g'`]
+-        CPPFLAGS="$CPPFLAGS -g -O0"
+-else
+-    CPPFLAGS=[`echo "$CXXFLAGS" | $SED -e 's/-O[0-9]*//g'`]

 -      CPPFLAGS="$CPPFLAGS -O3"
 -      CPPFLAGS="$CPPFLAGS -O3"

-+      CPPFLAGS="$CPPFLAGS"
++        CXXFLAGS="$CXXFLAGS -g"

  fi
  
  AC_ARG_ENABLE(Werror,
  fi
  
  AC_ARG_ENABLE(Werror,

+@@ -127,7 +123,7 @@
+ echo "  Compile Warnings: $enable_Werror"
+ echo ""
+ echo "The following options will be passed to the compiler:"
+-echo "  $CPPFLAGS"
++echo "  $CPPFLAGS $CXXFLAGS"
+ echo ""
+ echo "======================================================================"
+ echo ""