yann@96: diff -ur gdb-6.4/gdb/configure gdb-6.4-patched/gdb/configure
yann@96: --- gdb-6.4/gdb/configure	2005-07-25 10:08:40.000000000 -0500
yann@96: +++ gdb-6.4-patched/gdb/configure	2007-02-05 13:22:36.000000000 -0600
yann@96: @@ -309,7 +309,7 @@
yann@96:  # include <unistd.h>
yann@96:  #endif"
yann@96:  
yann@96: -ac_subdirs_all="$ac_subdirs_all doc testsuite"
yann@96: +ac_subdirs_all="$ac_subdirs_all doc"
yann@96:  ac_subdirs_all="$ac_subdirs_all gdbtk"
yann@96:  ac_subdirs_all="$ac_subdirs_all multi-ice"
yann@96:  ac_subdirs_all="$ac_subdirs_all gdbserver"
yann@96: @@ -5940,7 +5940,7 @@
yann@96:  
yann@96:  
yann@96:  
yann@96: -subdirs="$subdirs doc testsuite"
yann@96: +subdirs="$subdirs doc"
yann@96:  
yann@96:  
yann@96:  . $srcdir/configure.host
yann@96: diff -ur gdb-6.4/gdb/gdbserver/configure gdb-6.4-patched/gdb/gdbserver/configure
yann@96: --- gdb-6.4/gdb/gdbserver/configure	2005-09-17 18:14:37.000000000 -0500
yann@96: +++ gdb-6.4-patched/gdb/gdbserver/configure	2007-02-05 13:22:58.000000000 -0600
yann@96: @@ -1239,7 +1239,7 @@
yann@96:        ac_cache_corrupted=: ;;
yann@96:      ,);;
yann@96:      *)
yann@96: -      if test "x$ac_old_val" != "x$ac_new_val"; then
yann@96: +      if test "`echo $ac_old_val`" != "`echo $ac_new_val`"; then
yann@96:  	{ echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
yann@96:  echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
yann@96:  	{ echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5
yann@96: diff -ur gdb-6.4/gdb/testsuite/configure gdb-6.4-patched/gdb/testsuite/configure
yann@96: --- gdb-6.4/gdb/testsuite/configure	2005-04-11 09:13:12.000000000 -0500
yann@96: +++ gdb-6.4-patched/gdb/testsuite/configure	2007-02-05 13:22:36.000000000 -0600
yann@96: @@ -1248,7 +1248,7 @@
yann@96:        ac_cache_corrupted=: ;;
yann@96:      ,);;
yann@96:      *)
yann@96: -      if test "x$ac_old_val" != "x$ac_new_val"; then
yann@96: +      if test "`echo $ac_old_val" != "`echo $ac_new_val"; then
yann@96:  	{ echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
yann@96:  echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
yann@96:  	{ echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5
yann@96: diff -ur gdb-6.4/Makefile.in gdb-6.4-patched/Makefile.in
yann@96: --- gdb-6.4/Makefile.in	2005-12-01 23:29:54.000000000 -0600
yann@96: +++ gdb-6.4-patched/Makefile.in	2007-02-05 13:22:36.000000000 -0600
yann@96: @@ -383,7 +383,7 @@
yann@96:  # CFLAGS will be just -g.  We want to ensure that TARGET libraries
yann@96:  # (which we know are built with gcc) are built with optimizations so
yann@96:  # prepend -O2 when setting CFLAGS_FOR_TARGET.
yann@96: -CFLAGS_FOR_TARGET = -O2 $(CFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET)
yann@96: +CFLAGS_FOR_TARGET = $(strip $(CFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET))
yann@96:  SYSROOT_CFLAGS_FOR_TARGET = @SYSROOT_CFLAGS_FOR_TARGET@
yann@96:  
yann@96:  # If GCC_FOR_TARGET is not overriden on the command line, then this
yann@96: @@ -423,7 +423,7 @@
yann@96:      fi; \
yann@96:    fi`
yann@96:  
yann@96: -CXXFLAGS_FOR_TARGET = $(CXXFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET)
yann@96: +CXXFLAGS_FOR_TARGET = $(strip $(CXXFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET))
yann@96:  LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates
yann@96:  
yann@96:  GCJ_FOR_TARGET=$(STAGE_CC_WRAPPER) @GCJ_FOR_TARGET@ $(FLAGS_FOR_TARGET)
yann@96: diff -ur gdb-6.4/Makefile.tpl gdb-6.4-patched/Makefile.tpl
yann@96: --- gdb-6.4/Makefile.tpl	2005-10-22 05:37:55.000000000 -0500
yann@96: +++ gdb-6.4-patched/Makefile.tpl	2007-02-05 13:22:36.000000000 -0600
yann@96: @@ -386,7 +386,7 @@
yann@96:  # CFLAGS will be just -g.  We want to ensure that TARGET libraries
yann@96:  # (which we know are built with gcc) are built with optimizations so
yann@96:  # prepend -O2 when setting CFLAGS_FOR_TARGET.
yann@96: -CFLAGS_FOR_TARGET = -O2 $(CFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET)
yann@96: +CFLAGS_FOR_TARGET = $(strip $(CFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET))
yann@96:  SYSROOT_CFLAGS_FOR_TARGET = @SYSROOT_CFLAGS_FOR_TARGET@
yann@96:  
yann@96:  # If GCC_FOR_TARGET is not overriden on the command line, then this
yann@96: @@ -426,7 +426,7 @@
yann@96:      fi; \
yann@96:    fi`
yann@96:  
yann@96: -CXXFLAGS_FOR_TARGET = $(CXXFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET)
yann@96: +CXXFLAGS_FOR_TARGET = $(strip $(CXXFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET))
yann@96:  LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates
yann@96:  
yann@96:  GCJ_FOR_TARGET=$(STAGE_CC_WRAPPER) @GCJ_FOR_TARGET@ $(FLAGS_FOR_TARGET)