X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/f21ce5a3f7a89e5de4916f352becc575db06af64..ccda5c9eacfd97f0064c8d6102d3c5f06cb541c1:/djgpp/config.sed?ds=sidebyside diff --git a/djgpp/config.sed b/djgpp/config.sed index e08fd98e..d5a5807c 100644 --- a/djgpp/config.sed +++ b/djgpp/config.sed @@ -1,74 +1,96 @@ # DJGPP specific configuration file. +# Sed script for additional DJGPP specific editing +# of the configure script generated by autoconf 2.62. -# Copyright (C) 2005, 2006 Free Software Foundation, Inc. +# Copyright (C) 2005-2012 Free Software Foundation, Inc. -# This program is free software; you can redistribute it and/or modify +# This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation, either version 3 of the License, or # (at your option) any later version. - +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. - +# # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software Foundation, -# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# along with this program. If not, see . + # Additional editing of Makefiles -/(echo[ ]*':t/ a\ +/^eval sed.*ac_file_inputs.*tmp\/out \\$/ { +:loop +n +/^$/!b loop +a\ +cat > "$tmp/subs-djgpp.sed" << eof_djgpp\ # DJGPP specific Makefile changes.\ - /^aliaspath * *=/s,:,";",g;t t\ - /TEXINPUTS=/s,:,";",g;t t\ - /PATH=/s,:,";",g;t t\ - s,\\.deps,_deps,g;t t\ - s,\\.new\\.,_new.,g;t t\ - s,\\.old\\.,_old.,g;t t\ - s,c++\\.at,cxx.at,g;t t\ - s,c++\\.m4,cxx.m4,g;t t\ - s,calc++,calcxx,g;t t\ - s,scan-gram-c,c-scan-gram,g;t t\ - s,scan-skel-c,c-scan-skel,g;t t\ - s,Makefile\\.in\\.in,Makefile.in-in,g;t t\ - s,Makefile\\.am\\.in,Makefile.am-in,g;t t\ - s,(MAKEINFOFLAGS),& --no-split,\ - /^install-info-am:/,/^$/ {\ - /@list=/ s,\\\$(INFO_DEPS),& bison.i,\ - /@for *file/ s,\\\$(INFO_DEPS),& bison.i,\ - s,file-\\[0-9\\]\\[0-9\\],& \\$\\$file[0-9] \\$\\$file[0-9][0-9],\ - }\ - /^\\.y\\.c:/,/^$/ {\ - /\\\$(YACCCOMPILE)/ {\ - a\\\ - -@test -f y.tab.c && mv -f y.tab.c y_tab.c\\\ +s,\\.deps,_deps,g\ +s,\\.libs,_libs,g\ +s,\\.new\\.,_new.,g\ +s,\\.old\\.,_old.,g\ +s,\\.tab\\.,_tab.,g\ +s,c++\\.at,cxx.at,g\ +s,c++\\.m4,cxx.m4,g\ +s,c++-skel\\.m4,cxx-skel.m4,g\ +s,calc++,calcxx,g\ +s,scan-gram-c,c-scan-gram,g\ +s,scan-skel-c,c-scan-skel,g\ +s,inttypes_,_inttypes,g\ +s,javacomp\\.sh\\.in,javacomp.sh-in,g\ +s,javaexec\\.sh\\.in,javaexec.sh-in,g\ +s,yacc\\.1\\.in,yacc.1-in,g\ +s,bench\\.pl\\.in,bench.pl-in,g\ +s,Makefile\\.am\\.in,Makefile.am-in,g\ +s,Makefile\\.in\\.in,Makefile.in-in,g\ +/^\\.y\\.c:/,/^$/ {\ + /\\\$(YACCCOMPILE)/ {\ + a\\\\\ + -@test -f y.tab.c && mv -f y.tab.c y_tab.c\\\\\ -@test -f y.tab.h && mv -f y.tab.h y_tab.h\ - }\ }\ -/^libbison.a:/ i\\\ -\\$(top_srcdir)/djgpp/subpipe.c: \\$(top_srcdir)/djgpp/subpipe.h\\\ -subpipe.o: \\$(top_srcdir)/djgpp/subpipe.c \\$(top_srcdir)/djgpp/subpipe.h\\\ +}\ +/^libbison.a:/ i\\\\\ +\\$(top_srcdir)/djgpp/subpipe.c: \\$(top_srcdir)/djgpp/subpipe.h\\\\\ +subpipe.o: \\$(top_srcdir)/djgpp/subpipe.c \\$(top_srcdir)/djgpp/subpipe.h\\\\\ \\$(COMPILE) -c \\$<\ -/^yacc:/ i\\\ -yacc.bat:\\\ +/^yacc:/ i\\\\\ +yacc.bat:\\\\\ echo "bison\\$(EXEEXT) -y %1 %2 %3 %4 %5 %6 %7 %8 %9" >\\$@\ /^bin_SCRIPTS =/s/$/ yacc.bat/\ -/^MOSTLYCLEANFILES = yacc/s/$/ yacc.bat/ - +/^MOSTLYCLEANFILES = yacc/s/$/ yacc.bat/\ +/cross-options.texi:/,/^$/ s|bison|&.exe|g\ +/^\\.x\\.1:/,/^$/ s|\\$program|&.exe|g\ +eof_djgpp\ +sed -f "\$tmp/subs-djgpp.sed" \$tmp/out > \$tmp/out.djgpp\ +mv -f \$tmp/out.djgpp \$tmp/out +} # Makefile.in.in is renamed to Makefile.in-in. -/ac_config_files=/,/_ACEOF/ { - s|po/Makefile\.in|&:po/Makefile.in-in| +/ac_config_files=/ { + /runtime-po/!s|po/Makefile\.in|&:po/Makefile.in-in| + s|runtime-po/Makefile\.in|&:runtime-po/Makefile.in-in| + s|javacomp\.sh\.in|javacomp.sh-in| + s|javaexec\.sh\.in|javaexec.sh-in| + s|doc/yacc\.1|&:doc/yacc.1-in| + s|etc/bench.pl|&:etc/bench.pl-in| +} + +/CONFIG_FILES=/ { + /runtime-po/!s|po/Makefile\.in|&:po/Makefile.in-in|2 + s|runtime-po/Makefile\.in|&:runtime-po/Makefile.in-in|2 + s|javacomp\.sh\.in|javacomp.sh-in| + s|javaexec\.sh\.in|javaexec.sh-in| + s|doc/yacc\.1|&:doc/yacc.1-in|2 + s|etc/bench\.pl|&:etc/bench.pl-in|2 } -/CONFIG_FILES=/ s|po/Makefile\.in|&:po/Makefile.in-in|2 # We always use _deps and _libs instead of .deps and .libs, because # the latter is an invalid name on 8+3 MS-DOS file system. This makes # the generated Makefiles good for every DJGPP installation, not only # the one where the package was configured (which could happen to be # a Windows box, where leading dots in file names are allowed). -s,\.deps,_deps,g -s,\.libs,_libs,g /^rmdir[ ]*\.tst/ i\ am__leading_dot=_ @@ -88,18 +110,6 @@ am__leading_dot=_ # DOS-style absolute file names should be supported as well /\*) top_srcdir=/s,/\*,[\\\\/]* | ?:[\\\\/]*, -# Prevent the spliting of subs.sed. -# The sed script: subs.sed is split into 48 lines long files. -# This will produce sed scripts called subs-$ac_sed_frag.sed, where -# $ac_sed_frag is some unique number. This will not work if the splited -# sed script contains a multiple line sed command at line #48. In this -# case the first part of the multiple line sed command will be written -# at the end of one particular subs-$ac_sed_frag.sed and the rest of the -# sed command will be written at the begining of the next subs-$ac_sed_frag.sed -# making both sed script useless. -# This matches the configure script produced by Autoconf 2.57 -/ac_max_sed_lines=[0-9]/ s,=.*$,=`sed -n "$=" $tmp/subs.sed`, - # The following two items are changes needed for configuring # and compiling across partitions. # 1) The given srcdir value is always translated from the @@ -117,32 +127,30 @@ am__leading_dot=_ # which the package has not been configured for. /MISSING=/,/^$/ { /^fi$/ a\ -am_missing_run=`echo "$am_missing_run" | sed 's%/dev.*/bison[-_0-9]\\{1,1\\}[-.0-9A-z]*%${top_srcdir}%;s%.:.*/bison[-_0-9]\\{1,1\\}[-.0-9A-z]*%${top_srcdir}%'` +am_missing_run=`echo "$am_missing_run" | sed 's%/dev/.*/bison[-_0-9]\\{1,1\\}[-.0-9A-Za-z+]*%${top_srcdir}%;s%.:.*/bison[-_0-9]\\{1,1\\}[-.0-9A-Za-z+]*%${top_srcdir}%'` } /^install_sh=/a\ -install_sh=`echo "$install_sh" | sed 's%/dev.*/bison[-_0-9]\\{1,1\\}[-.0-9A-z]*%${top_srcdir}%;s%.:.*/bison[-_0-9]\\{1,1\\}[-.0-9A-z]*%${top_srcdir}%'` +install_sh=`echo "$install_sh" | sed 's%/dev/.*/bison[-_0-9]\\{1,1\\}[-.0-9A-Za-z+]*%${top_srcdir}%;s%.:.*/bison[-_0-9]\\{1,1\\}[-.0-9A-Za-z+]*%${top_srcdir}%'` # This will only work if the assumption that the # testsuite is ran from the following path: # ${top_srcdir}/tests/testsuite.dir # holds. The explicit names are of no importance. # ../../. == ${top_srcdir} -/\.)[ ]*ac_abs_builddir=/,/^esac$/ { - /^esac$/ a\ -ac_abs_builddir=`echo "$ac_abs_builddir" | sed "s%/dev.*/bison[-_0-9]\\{1,1\\}[-.0-9A-z]*/[^/]*%../../.%;s%.:.*/bison[-_0-9]\\{1,1\\}[-.0-9A-z]*/[^/]*%../../.%"` -} -/\.)[ ]*ac_abs_top_builddir=/,/^esac$/ { - /^esac$/ a\ -ac_abs_top_builddir=`echo "$ac_abs_top_builddir" | sed "s%/dev.*/bison[-_0-9]\\{1,1\\}[-.0-9A-z]*/[^/]*%../../../%;s%.:.*/bison[-_0-9]\\{1,1\\}[-.0-9A-z]*/[^/]*%../../../%"` -} -/\.)[ ]*ac_abs_srcdir=/,/^esac$/ { - /^esac$/ a\ -ac_abs_srcdir=`echo "$ac_abs_srcdir" | sed "s%/dev.*/bison[-_0-9]\\{1,1\\}[-.0-9A-z]*/[^/]*%../../.%;s%.:.*/bison[-_0-9]\\{1,1\\}[-.0-9A-z]*/[^/]*%../../.%"` -} -/\.)[ ]*ac_abs_top_srcdir=/,/^esac$/ { - /^esac$/ a\ -ac_abs_top_srcdir=`echo "$ac_abs_top_srcdir" | sed "s%/dev.*/bison[-_0-9]\\{1,1\\}[-.0-9A-z]*/[^/]*%../../../%;s%.:.*/bison[-_0-9]\\{1,1\\}[-.0-9A-z]*/[^/]*%../../../%"` -} +#/^esac$/,/^ac_abs_srcdir=/ { +/^ac_abs_srcdir=/ i\ +ac_abs_builddir=`echo "$ac_abs_builddir" | sed "s%/dev/.*/bison[-_0-9]\\{1,1\\}[-.0-9A-Za-z+]*%../../.%;s%.:.*/bison[-_0-9]\\{1,1\\}[-.0-9A-Za-z+]*%../../.%"`\ +ac_abs_top_builddir=`echo "$ac_abs_top_builddir" | sed "s%/dev/.*/bison[-_0-9]\\{1,1\\}[-.0-9A-Za-z+]*%../../..%;s%.:.*/bison[-_0-9]\\{1,1\\}[-.0-9A-Za-z+]*%../../..%"`\ +ac_abs_top_srcdir=`echo "$ac_abs_top_srcdir" | sed "s%/dev/.*/bison[-_0-9]\\{1,1\\}[-.0-9A-Za-z+]*%../../..%;s%.:.*/bison[-_0-9]\\{1,1\\}[-.0-9A-Za-z+]*%../../..%"` +#ac_abs_srcdir=`echo "$ac_abs_srcdir" | sed "s%/dev/.*/bison[-_0-9]\\{1,1\\}[-.0-9A-Za-z+]*%../../.%;s%.:.*/bison[-_0-9]\\{1,1\\}[-.0-9A-Za-z+]*%../../.%"` +/^ac_abs_srcdir=/ a\ +for dj_dir in $ac_abs_builddir $ac_abs_top_builddir $ac_abs_top_srcdir $ac_abs_srcdir\ +do\ + ac_abs_builddir=`echo "$ac_abs_builddir" | sed "s%//%/%g"`\ + ac_abs_top_builddir=`echo "$ac_abs_top_builddir" | sed "s%//%/%g"`\ + ac_abs_top_srcdir=`echo "$ac_abs_top_srcdir" | sed "s%//%/%g"`\ + ac_abs_srcdir=`echo "$ac_abs_srcdir" | sed "s%//%/%g"`\ +done # Add DJGPP version information. /^#define VERSION/ s/\$VERSION/& (DJGPP port (r1))/ @@ -157,5 +165,26 @@ ac_abs_top_srcdir=`echo "$ac_abs_top_srcdir" | sed "s%/dev.*/bison[-_0-9]\\{1,1\ ac_djgpp_path=`echo "$DJDIR" | sed 's%\\\\\\%/%g' | tr $as_cr_LETTERS $as_cr_letters`\ ac_cv_flibs=`echo "$ac_cv_flibs" | sed "s%-L$ac_djgpp_path%-L/dev/env/DJDIR%g"` +# Autoconf generated configure scripts write absolute +# paths of certain header files into Makefiles making +# them useless for DJGPP installations for which the +# package has not been configured for. +/^.*echo "\$as_me:\$LINENO: result: \$gl_cv_absolute_.*$/ { +h +s,^.*\(gl_cv_absolute_\)\([a-z0-9_]*\)\(_h\).*$,\1\2\3=`echo $\1\2\3 | sed "s%[^:]:.*/include/%/dev/env/DJDIR/include/%"`, +G +} +/^.*echo "\$as_me:\$LINENO: result: \$gl_cv_full_.*$/ { +h +s,^.*\(gl_cv_full_\)\([a-z0-9_]*\)\(_h\).*$,\1\2\3=`echo $\1\2\3 | sed "s%[^:]:.*/include/%/dev/env/DJDIR/include/%"`, +G +} + # The following is not a valid DOS file name s/calc++/calcxx/g + +# The CR test for awk does not work for DJGPP. +/^ac_cs_awk_cr=/,/^$/ { + /^fi$/ a\ +ac_cs_awk_cr=$ac_cr +}