diff options
| -rw-r--r-- | gdb/ChangeLog | 12 | ||||
| -rw-r--r-- | gdb/config/djgpp/config.sed | 19 | ||||
| -rw-r--r-- | gdb/config/djgpp/djconfig.sh | 17 | ||||
| -rw-r--r-- | gdb/configure.in | 3 |
4 files changed, 42 insertions, 9 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 5c2e531..2ab9e11 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,15 @@ +2003-12-29 Eli Zaretskii <eliz@elta.co.il> + + * configure.in: Set ac_cv_search_tgetent to "none required" for + "*djgpp*" targets as well (DJGPP doesn't have termcap and doesn't + need one). + + * config/djgpp/config.sed: Tweak to adapt to the changes in + configury. + + * config/djgpp/djconfig.sh: Fix the test of unpacked + distribution, since there's no gdb.cxx directory anymore. + 2003-12-28 Mark Kettenis <kettenis@gnu.org> * i386-sol2-tdep.c (i386_sol2_mcontext_addr): New function. diff --git a/gdb/config/djgpp/config.sed b/gdb/config/djgpp/config.sed index 7cc9d3f..4313bfb 100644 --- a/gdb/config/djgpp/config.sed +++ b/gdb/config/djgpp/config.sed @@ -3,7 +3,7 @@ s|gdb\.c++|gdb.cxx|g /ac_rel_source/s|ln -s|cp -p| s|\.gdbinit|gdb.ini|g -/ac_given_INSTALL=/,/^CEOF/ { +/^ac_given_INSTALL=/,/^CEOF/ { /^s%@prefix@%/a\ s,\\([yp*]\\)\\.tab,\\1_tab,g\ /^ @rm -f/s,\\$@-\\[0-9\\]\\[0-9\\],& *.i[1-9] *.i[1-9][0-9],\ @@ -12,19 +12,27 @@ s|\.gdbinit|gdb.ini|g s,\\.info\\*,.inf* *.i[1-9] *.i[1-9][0-9],\ s,\\.gdbinit,gdb.ini,g\ /TEXINPUTS=/s,:,';',g\ - /VPATH *=/s,\\([^A-z]\\):,\1;,g\ + /VPATH *=/s,\\([^A-z]\\):,\\1;,g\ /\\$\\$file-\\[0-9\\]/s,echo,& *.i[1-9] *.i[1-9][0-9],\ /\\$\\$file-\\[0-9\\]/s,rm -f \\$\\$file,& \\${PACKAGE}.i[1-9] \\${PACKAGE}.i[1-9][0-9],\ s,config\\.h\\.in,config.h-in,g\ s,po2tbl\\.sed\\.in,po2tblsed.in,g + +} + +/^ac_given_srcdir=/,/^CEOF/ { + /^s%@TOPLEVEL_CONFIGURE_ARGUMENTS@%/a\ + /@test ! -f /s,\\(.\\)\$, export am_cv_exeext=.exe; export lt_cv_sys_max_cmd_len=12288; \\1, + } /^CONFIG_FILES=/,/^EOF/ { - s|po/Makefile.in\([^-:]\)|po/Makefile.in:po/Makefile.in-in\1| + s|po/Makefile.in\([^-:a-z]\)|po/Makefile.in:po/Makefile.in-in\1| } -/^ *CONFIG_HEADERS=/,/^EOF/ { - s|config.h\([^-:]\)|config.h:config.h-in\1| +/^ *# *Handling of arguments/,/^done/ { + s| config.h"| config.h:config.h-in"| + s|config.h\([^-:"a-z]\)|config.h:config.h-in\1| } /^[ ]*\/\*)/s,/\*,/*|[A-z]:/*, @@ -32,3 +40,4 @@ s|\.gdbinit|gdb.ini|g /\$]\*) 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", diff --git a/gdb/config/djgpp/djconfig.sh b/gdb/config/djgpp/djconfig.sh index 23be0d5..c79dbfb 100644 --- a/gdb/config/djgpp/djconfig.sh +++ b/gdb/config/djgpp/djconfig.sh @@ -5,7 +5,7 @@ # configuring other GNU programs for DJGPP. # #===================================================================== -# Copyright 1997, 1999, 2000, 2001, 2002 Free Software Foundation, Inc. +# Copyright 1997,1999,2000,2001,2002,2003 Free Software Foundation, Inc. # # Originally written by Robert Hoehne, revised by Eli Zaretskii. # This file is part of GDB. @@ -52,9 +52,21 @@ fi # Make sure they don't have some file names mangled by untarring. echo -n "Checking the unpacked distribution..." if ( ! test -f ${srcdir}/intl/po2tblsed.in || \ - ! test -d ${srcdir}/gdb/testsuite/gdb.cxx || \ + ! test -f ${srcdir}/gdb/ChangeLog.002 || \ ! test -f ${srcdir}/readline/config.h-in ) ; then + if ( ! test -f ${srcdir}/intl/po2tblsed.in ) ; then + notfound=${srcdir}/intl/po2tblsed.in + else + if ( ! test -d ${srcdir}/gdb/testsuite/cxx) ; then + notfound=${srcdir}/gdb/ChangeLog.002 + else + if ( ! test -f ${srcdir}/readline/config.h-in ) ; then + notfound=${srcdir}/readline/config.h-in + fi + fi + fi echo " FAILED." + echo "(File $notfound was not found.)" echo "" echo "You MUST unpack the sources with the DJTAR command, like this:" echo "" @@ -62,6 +74,7 @@ if ( ! test -f ${srcdir}/intl/po2tblsed.in || \ echo "" echo "where X.YZ is the GDB version, and fnchange.lst can be found" echo "in the gdb/config/djgpp/ directory in the GDB distribution." + echo "" echo "configure FAILED!" exit 1 else diff --git a/gdb/configure.in b/gdb/configure.in index 128c744..d27470c 100644 --- a/gdb/configure.in +++ b/gdb/configure.in @@ -317,8 +317,7 @@ case $host_os in LIBS="../libtermcap/libtermcap.a $LIBS" ac_cv_search_tgetent="../libtermcap/libtermcap.a" fi ;; - go32*) - # ??? Is this really true? + go32* | *djgpp*) ac_cv_search_tgetent="none required" ;; aix*) |