diff -r -U 5 sdcc.orig/configure sdcc/configure

--- sdcc.orig/configure	2008-09-09 02:27:26.000000000 -0700

+++ sdcc/configure	2008-09-09 02:29:24.000000000 -0700

@@ -2516,11 +2516,11 @@

   echo $ECHO_N "(cached) $ECHO_C" >&6

 else

   ac_save_c_werror_flag=$ac_c_werror_flag

    ac_c_werror_flag=yes

    ac_cv_prog_cc_g=no

-   CFLAGS="-g"

+:  CFLAGS="-g"

    cat >conftest.$ac_ext <<_ACEOF

 /* confdefs.h.  */

 _ACEOF

 cat confdefs.h >>conftest.$ac_ext

 cat >>conftest.$ac_ext <<_ACEOF

@@ -2554,11 +2554,11 @@

   ac_cv_prog_cc_g=yes

 else

   echo "$as_me: failed program was:" >&5

 sed 's/^/| /' conftest.$ac_ext >&5

-	CFLAGS=""

+:	CFLAGS=""

       cat >conftest.$ac_ext <<_ACEOF

 /* confdefs.h.  */

 _ACEOF

 cat confdefs.h >>conftest.$ac_ext

 cat >>conftest.$ac_ext <<_ACEOF

@@ -2593,11 +2593,11 @@

 else

   echo "$as_me: failed program was:" >&5

 sed 's/^/| /' conftest.$ac_ext >&5

 	ac_c_werror_flag=$ac_save_c_werror_flag

-	 CFLAGS="-g"

+:	 CFLAGS="-g"

 	 cat >conftest.$ac_ext <<_ACEOF

 /* confdefs.h.  */

 _ACEOF

 cat confdefs.h >>conftest.$ac_ext

 cat >>conftest.$ac_ext <<_ACEOF

@@ -2646,22 +2646,22 @@

    ac_c_werror_flag=$ac_save_c_werror_flag

 fi

 { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5

 echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }

 if test "$ac_test_CFLAGS" = set; then

-  CFLAGS=$ac_save_CFLAGS

+: CFLAGS=$ac_save_CFLAGS

 elif test $ac_cv_prog_cc_g = yes; then

   if test "$GCC" = yes; then

-    CFLAGS="-g -O2"

+:   CFLAGS="-g -O2"

   else

-    CFLAGS="-g"

+:   CFLAGS="-g"

   fi

 else

   if test "$GCC" = yes; then

-    CFLAGS="-O2"

+:   CFLAGS="-O2"

   else

-    CFLAGS=

+:   CFLAGS=

   fi

 fi

 { echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5

 echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }

 if test "${ac_cv_prog_cc_c89+set}" = set; then

@@ -3794,11 +3794,11 @@

 fi

 { echo "$as_me:$LINENO: result: $sdcc_cv_CCggdb" >&5

 echo "${ECHO_T}$sdcc_cv_CCggdb" >&6; }

 if test "$sdcc_cv_CCggdb" = "yes"; then

-  CFLAGS="-ggdb ${CFLAGS}"

+: CFLAGS="-ggdb ${CFLAGS}"

 fi

 { echo "$as_me:$LINENO: checking whether $CC accepts -pipe" >&5

 echo $ECHO_N "checking whether $CC accepts -pipe... $ECHO_C" >&6; }

@@ -3819,11 +3819,11 @@

 fi

 { echo "$as_me:$LINENO: result: $sdcc_cv_CCpipe" >&5

 echo "${ECHO_T}$sdcc_cv_CCpipe" >&6; }

 if test "$sdcc_cv_CCpipe" = "yes"; then

-  CFLAGS="-pipe $CFLAGS"

+: CFLAGS="-pipe $CFLAGS"

 fi

 # Checks for typedefs, structures, and compiler characteristics.

 # ===========================================================================

diff -r -U 5 sdcc.orig/configure.in sdcc/configure.in

--- sdcc.orig/configure.in	2008-09-09 02:27:26.000000000 -0700

+++ sdcc/configure.in	2008-09-09 02:29:33.000000000 -0700

@@ -321,16 +321,16 @@

 AC_SUBST(M_OR_MM)

 # This is the first time when CFLAGS are set/modified!!

 adl_DD_COPT(CC, ggdb)

 if test "$sdcc_cv_CCggdb" = "yes"; then

-  CFLAGS="-ggdb ${CFLAGS}"

+: CFLAGS="-ggdb ${CFLAGS}"

 fi

 adl_DD_COPT(CC, pipe)

 if test "$sdcc_cv_CCpipe" = "yes"; then

-  CFLAGS="-pipe $CFLAGS"

+: CFLAGS="-pipe $CFLAGS"

 fi

 # Checks for typedefs, structures, and compiler characteristics.

 # ===========================================================================

diff -r -U 5 sdcc.orig/sim/ucsim/configure sdcc/sim/ucsim/configure

--- sdcc.orig/sim/ucsim/configure	2008-09-09 02:27:26.000000000 -0700

+++ sdcc/sim/ucsim/configure	2008-09-09 02:30:25.000000000 -0700

@@ -12458,15 +12458,15 @@

 fi

 { echo "$as_me:$LINENO: result: $ucsim_cv_CXXgstabs" >&5

 echo "${ECHO_T}$ucsim_cv_CXXgstabs" >&6; }

 if test "$ucsim_cv_CXXgstabs" = "yes"; then

-   gopt="-gstabs+ -g3"

+:  gopt="-gstabs+ -g3"

 elif test "$ucsim_cv_CXXggdb" = "yes"; then

-     gopt="-ggdb -g3"

+:    gopt="-ggdb -g3"

 else

-     gopt="-g"

+:    gopt="-g"

 fi

 if test "$CXXFLAGS"x = x ;then

         CXXFLAGS="$gopt"

 else

         CXXFLAGS="$CXXFLAGS $gopt"

diff -r -U 5 sdcc.orig/sim/ucsim/configure.in sdcc/sim/ucsim/configure.in

--- sdcc.orig/sim/ucsim/configure.in	2008-09-09 02:27:26.000000000 -0700

+++ sdcc/sim/ucsim/configure.in	2008-09-09 02:30:13.000000000 -0700

@@ -517,15 +517,15 @@

 # This is the first time when CFLAGS are set/modified!!

 DD_COPT(CXX, ggdb)

 DD_COPT(CXX, gstabs)

 if test "$ucsim_cv_CXXgstabs" = "yes"; then

-   gopt="-gstabs+ -g3"

+:  gopt="-gstabs+ -g3"

 elif test "$ucsim_cv_CXXggdb" = "yes"; then

-     gopt="-ggdb -g3"

+:    gopt="-ggdb -g3"

 else

-     gopt="-g"

+:    gopt="-g"

 fi

 if test "$CXXFLAGS"x = x ;then

         CXXFLAGS="$gopt"

 else

         CXXFLAGS="$CXXFLAGS $gopt"