Merge remote-tracking branch 'origin/maint'

[bison.git] / djgpp / config.sed

diff --git a/djgpp/config.sed b/djgpp/config.sed
index 2f9eab30d8dbfd3615cf25176f4557466c1d1283..d5a5807c4ffd9c4397045bef57d3b5c09571a32a 100644 (file)
--- a/djgpp/config.sed
+++ b/djgpp/config.sed
@@ -1,9 +1,8 @@
 # DJGPP specific configuration file.
 # Sed script for additional DJGPP specific editing
-# of the configure script generated by autoconf 2.61.
+# 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
 # it under the terms of the GNU General Public License as published by
@@ -20,7 +19,11 @@
 
 
 # Additional editing of Makefiles
-/^".*ac_file_inputs.*tmp\/out$/ a\
+/^eval sed.*ac_file_inputs.*tmp\/out \\$/ {
+:loop
+n
+/^$/!b loop
+a\
 cat > "$tmp/subs-djgpp.sed" << eof_djgpp\
 # DJGPP specific Makefile changes.\
 s,\\.deps,_deps,g\
@@ -35,6 +38,10 @@ 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:/,/^$/ {\
@@ -53,20 +60,30 @@ 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/\
+/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=/ {
   /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
 }
 
 # We always use _deps and _libs instead of .deps and .libs, because
@@ -165,3 +182,9 @@ 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
+}