Sanitize away "*-windows*" host makefile frag when sanitizing

with --lose-mswin.

diff --git a/.Sanitize b/.Sanitize
index 8bf6ed4da3b084d739a262bd8f1652a55542ec17..630a240b1df6a9c4f39f9333d116914039390524 100644 (file)
--- a/.Sanitize
+++ b/.Sanitize
@@ -537,6 +537,48 @@ else
        done
 fi
 
+if ( echo $* | grep lose\-mswin > /dev/null ) ; then
+       if [ -n "${verbose}" ] ; then
+               echo Removing traces of \"mswin\"...
+       fi
+       for i in * ; do
+               if test ! -d $i && (grep sanitize-mswin $i > /dev/null) ; then
+                       if [ -n "${verbose}" ] ; then
+                               echo Removing traces of \"mswin\" from $i...
+                       fi
+                       cp $i new
+                       sed '/start\-sanitize\-mswin/,/end-\sanitize\-mswin/d' < $i > new
+                       if [ -n "${safe}" -a ! -f .Recover/$i ] ; then
+                               if [ -n "${verbose}" ] ; then
+                                       echo Caching $i in .Recover...
+                               fi
+                               mv $i .Recover
+                       fi
+                       mv new $i
+               fi
+       done
+else
+       if [ -n "${verbose}" ] ; then
+               echo Leaving \"mswin\" in the sources...
+       fi
+       for i in * ; do
+               if test ! -d $i && (grep sanitize-mswin $i > /dev/null) ; then
+                       if [ -n "${verbose}" ] ; then
+                               echo Keeping \"mswin\" stuff in $i, but editing out sanitize lines...
+                       fi
+                       cp $i new
+                       sed -e '/start\-sanitize\-mswin/d' -e '/end\-sanitize\-mswin/d' < $i > new
+                       if [ -n "${safe}" -a ! -f .Recover/$i ] ; then
+                               if [ -n "${verbose}" ] ; then
+                                       echo Caching $i in .Recover...
+                               fi
+                               mv $i .Recover
+                       fi
+                       mv new $i
+               fi
+       done
+fi
+
 vr5400_files="ChangeLog config.sub"
 
 if ( echo $* | grep keep\-vr5400 > /dev/null ) ; then

diff --git a/configure.in b/configure.in
index 32a6b597601565f138f05c574943f2a16576418d..35ae8afdf58c8995fcbcc4b7f0bec1c9ac732699 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -191,9 +191,11 @@ case "${host}" in
   *-mingw32*)
     host_makefile_frag="${host_makefile_frag} config/mh-mingw32"
     ;;
+# start-sanitize-mswin
   *-windows*)
     host_makefile_frag="${host_makefile_frag} config/mh-windows"
     ;;
+# end-sanitize-mswin
   vax-*-ultrix2*)
     host_makefile_frag="${host_makefile_frag} config/mh-vaxult2"
     ;;