Convert underscores to dashes in some %define variable names.

[bison.git] / djgpp / config.sed

diff --git a/djgpp/config.sed b/djgpp/config.sed
index 03153ea8f8e6b289ebd81d1d013f6980ea223372..86050e432f4264c2a6ab15ef23b289e8ec828a34 100644 (file)
--- a/djgpp/config.sed
+++ b/djgpp/config.sed
@@ -1,32 +1,32 @@
 # DJGPP specific configuration file.
 # Sed script for additional DJGPP specific editing
 # DJGPP specific configuration file.
 # Sed script for additional DJGPP specific editing

-# of the configure script generated by autoconf 2.60.
+# of the configure script generated by autoconf 2.62.

 
 
 
 

-# Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+# Copyright (C) 2005, 2006, 2007, 2008 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
 # 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.
 # (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.
 # 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
 # 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 <http://www.gnu.org/licenses/>.

 
 
 # Additional editing of Makefiles
 
 
 # Additional editing of Makefiles

-/^".*ac_file_inputs.*tmp\/out$/ a\
-cat > "$tmp/subs-3.sed" << eof_djgpp\
+/^eval sed.*ac_file_inputs.*tmp\/out \\$/ {
+:loop
+n
+/^$/!b loop
+a\
+cat > "$tmp/subs-djgpp.sed" << eof_djgpp\

 # DJGPP specific Makefile changes.\
 # DJGPP specific Makefile changes.\

-/^aliaspath *  *=/s,:,";",g\
-/TEXINPUTS=/s,:,";",g\
-/PATH=/s,:,";",g\

 s,\\.deps,_deps,g\
 s,\\.libs,_libs,g\
 s,\\.new\\.,_new.,g\
 s,\\.deps,_deps,g\
 s,\\.libs,_libs,g\
 s,\\.new\\.,_new.,g\


@@ -34,9 +34,15 @@ s,\\.old\\.,_old.,g\
 s,\\.tab\\.,_tab.,g\
 s,c++\\.at,cxx.at,g\
 s,c++\\.m4,cxx.m4,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,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:/,/^$/ {\
 s,Makefile\\.am\\.in,Makefile.am-in,g\
 s,Makefile\\.in\\.in,Makefile.in-in,g\
 /^\\.y\\.c:/,/^$/ {\


@@ -55,20 +61,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/\
        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\
 eof_djgpp\

-sed -f "\$tmp/subs-3.sed" \$tmp/out > \$tmp/out.djgpp\
+sed -f "\$tmp/subs-djgpp.sed" \$tmp/out > \$tmp/out.djgpp\

 mv -f \$tmp/out.djgpp \$tmp/out
 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|
 
 # 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
 }
 
 /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
 }
 
 # We always use _deps and _libs instead of .deps and .libs, because


@@ -150,5 +166,26 @@ done
 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"`
 
 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 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
+}