pandora-build 0.9

diff --cc m4/pandora_canonical.m4
index 2f319732580a606ad28d380a22aecee90c1718df,a6b9b24ae8c32ca598a11024e81729f5a91a4590..2b13fe4706b5b72d1c9550b2baf6b653040ebff0
--- 1/m4/pandora_canonical.m4
--- 2/m4/pandora_canonical.m4
+++ b/m4/pandora_canonical.m4
@@@ -4,7 -4,7 +4,7 @@@ dnl gives unlimited permission to copy 
  dnl with or without modifications, as long as this notice is preserved.
  
  dnl Which version of the canonical setup we're using
- AC_DEFUN([PANDORA_CANONICAL_VERSION],[0.8])
 -AC_DEFUN([PANDORA_CANONICAL_VERSION],[0.3])
++AC_DEFUN([PANDORA_CANONICAL_VERSION],[0.9])
  
  AC_DEFUN([PANDORA_FORCE_DEPEND_TRACKING],[
    dnl Force dependency tracking on for Sun Studio builds

diff --cc m4/pandora_optimize.m4
index c255f2586abcd2b17b8402e717db866d60f64307,c255f2586abcd2b17b8402e717db866d60f64307..627bb277c3db8b4697dad0ca1086725b1503794d
--- 1/m4/pandora_optimize.m4
--- 2/m4/pandora_optimize.m4
+++ b/m4/pandora_optimize.m4
@@@ -39,12 -39,12 +39,15 @@@ AC_DEFUN([PANDORA_OPTIMIZE],
      CXX="${CXX} -xlang=c99"
  
      AM_CFLAGS="-g -mt -xstrconst -Xa ${AM_CFLAGS}"
--    AM_CXXFLAGS="-g -mt -compat=5 -library=stlport4 -template=no%extdef ${AM_CXXFLAGS}"
++    AM_CXXFLAGS="-mt -compat=5 -library=stlport4 -template=no%extdef ${AM_CXXFLAGS}"
++
++    DEBUG_CXXFLAGS="-g"
  
      dnl TODO: Make a test for -xO4 usability here
      OPTIMIZE_FLAGS="-xO3 -xlibmil -xdepend -xbuiltin"
      OPTIMIZE_CFLAGS="${OPTIMIZE_FLAGS}"
--    OPTIMIZE_CXXFLAGS="${OPTIMIZE_FLAGS}"
++    OPTIMIZE_CXXFLAGS="-g0 ${OPTIMIZE_FLAGS}"
++
    ])
  
    AC_ARG_WITH([debug],