From 348e86d95832f94c04e43abfb3715ce1a60be523 Mon Sep 17 00:00:00 2001
From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 5 Sep 2009 15:43:31 +0000
Subject: [PATCH] 	* config/djgpp/djconfig.sh: Fix for Autoconf 2.64. 
 * config/djgpp/config.sed: Fix for Autoconf 2.64.

---
 gdb/ChangeLog                |  5 +++++
 gdb/config/djgpp/config.sed  | 35 +++++++++++++++++------------------
 gdb/config/djgpp/djconfig.sh |  4 +++-
 3 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index e1ee38dbbf..353bfc00d8 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2009-09-05  Eli Zaretskii  <eliz@gnu.org>
+
+	* config/djgpp/djconfig.sh: Fix for Autoconf 2.64.
+	* config/djgpp/config.sed: Fix for Autoconf 2.64.
+
 2009-09-05  Hui Zhu  <teawater@gmail.com>
 
 	* i386-tdep.c (i386_record_s): Add orig_addr.
diff --git a/gdb/config/djgpp/config.sed b/gdb/config/djgpp/config.sed
index 98882cfe7f..633c5b9989 100644
--- a/gdb/config/djgpp/config.sed
+++ b/gdb/config/djgpp/config.sed
@@ -2,31 +2,37 @@ s|po2tbl\.sed\.in|po2tblsed.in|g
 s|gdb\.c++|gdb.cxx|g
 /ac_rel_source/s|ln -s|cp -p|
 s|\.gdbinit|gdb.ini|g
+# This works around a bug in DJGPP port of Bash 2.0x
+s|return $ac_retval|(&)|g
+# DJGPP port of Bash 2.04 doesn't like this redirection of stdin
+/exec 7</s|7<&0 </dev/null||
+# Make sure $PATH_SEPARATOR is set correctly
+/if test "${PATH_SEPARATOR+set}"/i\
+export PATH_SEPARATOR=';'
 
-# Edit Makefiles.  This should go near the beginning of
+# Edit Makefiles for 8+3 DOS file-name compliance and path separator.
+# This should go near the beginning of
 # the substitutions script, before the branch command that
 # skips any lines without @...@ in them.
 # Any commands that can match again after substitution must
 # do a conditional branch to next cycle (;t), or else Sed might hang.
-/(echo[ 	]*':t/a\
+/\/@\[a-zA-Z_\]\[a-zA-Z_0-9\]\*@\/!b/i\
+  /VPATH *=/s,\\([^A-z]\\):,\\1;,g\
   s,\\([yp*]\\)\\.tab,\\1_tab,g\
   s,\\$@\\.tmp,\\$@_tmp,g\
   s,\\$@\\.new,\\$@_new,g\
-  /^	@rm -f/s,\\$@-\\[0-9\\]\\[0-9\\],& *.i[1-9] *.i[1-9][0-9],;t\
   s,standards\\.info\\*,standard*.inf*,\
   s,configure\\.info\\*,configur*.inf*,\
   s,\\.info\\*,.inf* *.i[1-9] *.i[1-9][0-9],\
   s,\\.gdbinit,gdb.ini,g\
-  s,@PATH_SEPARATOR@,";",\
-  /TEXINPUTS=/s,:,";",g\
-  /VPATH *=/s,\\([^A-z]\\):,\\1;,g\
-  /\\$\\$file-\\[0-9\\]/s,echo,& *.i[1-9] *.i[1-9][0-9],;t\
-  /\\$\\$file-\\[0-9\\]/s,rm -f \\$\\$file,& \\${PACKAGE}.i[1-9] \\${PACKAGE}.i[1-9][0-9],;t\
+  /TEXINPUTS=/s,:,\\";\\",g\
   s,config\\.h\\.in,config.h-in,g;t t\
-  s,po2tbl\\.sed\\.in,po2tblsed.in,g;t t
+  /^	@rm -f/s,\\$@-\\[0-9\\]\\[0-9\\],& *.i[1-9] *.i[1-9][0-9],;t\
+  /\\$\\$file-\\[0-9\\]/s,echo,& *.i[1-9] *.i[1-9][0-9],;t\
+  /\\$\\$file-\\[0-9\\]/s,rm -f \\$\\$file,& \\${PACKAGE}.i[1-9] \\${PACKAGE}.i[1-9][0-9],;t
 
 # We have an emulation of nl_langinfo in go32-nat.c that supports CODESET.
-/^ac_cv_env_CPP_value=/a\
+/^for ac_var in $ac_precious_vars; do/i\
 am_cv_langinfo_codeset=yes\
 bash_cv_langinfo_codeset=yes\
 ac_cv_header_nl_types_h=yes
@@ -42,19 +48,12 @@ ac_cv_header_nl_types_h=yes
 
 }
 
-/^CONFIG_FILES=/,/^EOF/ {
-  s|po/Makefile.in\([^-:a-z]\)|po/Makefile.in:po/Makefile.in-in\1|
-}
-
 /^ *# *Handling of arguments/,/^done/ {
   s| config.h"| config.h:config.h-in"|
+  s| config.intl"| config.intl:config_intl.in"|
   s|config.h\([^-:"a-z]\)|config.h:config.h-in\1|
 }
 
 /^[ 	]*\/\*)/s,/\*,/*|[A-z]:/*,
-/\$]\*) INSTALL=/s,\[/\$\]\*,&|[A-z]:/*,
-/\$]\*) ac_rel_source=/s,\[/\$\]\*,&|[A-z]:/*,
-/ac_file_inputs=/s,\( -e "s%\^%\$ac_given_srcdir/%"\)\( -e "s%:% $ac_given_srcdir/%g"\),\2\1,
-/^[ 	]*if test "x`echo /s,sed 's@/,sed -e 's@^[A-z]:@@' -e 's@/,
 /^ *ac_config_headers=/s, config.h", config.h:config.h-in",
 /^ *ac_config_files=/s, config.intl", config.intl:config_intl.in",
diff --git a/gdb/config/djgpp/djconfig.sh b/gdb/config/djgpp/djconfig.sh
index cd61a3ad58..57b7042803 100644
--- a/gdb/config/djgpp/djconfig.sh
+++ b/gdb/config/djgpp/djconfig.sh
@@ -141,11 +141,13 @@ utod $srcdir/ltmain.sh
 export LD=ld
 export NM=nm
 export CC=gcc
-export CFLAGS="-O2 -g"
+export CXX=gpp
+export CFLAGS="-O2 -ggdb -g3"
 export RANLIB=ranlib
 export DEFAULT_YACC="bison -y"
 export YACC="bison -y"
 export DEFAULT_LEX=flex
+export PATH_SEPARATOR=';'
 # Define explicitly the .exe extension because on W95 with LFN=y
 # the check might fail
 export am_cv_exeext=.exe