[svn] Renamed configure.bat to configure.bat.in.

Added a rule to Makefile.in to construct configure.bat from configure.in
by copying the file and converting the line endings to MS-DOS format.
Submitted by Ian Abbott in <3C8E50BB.2967.518D2B@localhost>.

diff --git a/ChangeLog b/ChangeLog
index 1d768d8a1fbb43b2fdce4c6dc3a4e473a71f6e57..56442ca2061d7bfd7a5d23712441e98fde13953b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2002-03-13  Ian Abbott  <abbotti@mev.co.uk>
+
+       * configure.bat: Removed (renamed to configure.bat.ini).
+       * configure.bat.in: New (renamed from configure.bat).
+       * Makefile.in: Add rule to copy configure.bat.in to configure.bat,
+       converting line endings to MS-DOS format in the process.
+
 2002-01-15  Hrvoje Niksic  <hniksic@arsdigita.com>
 
        * MACHINES: OS X entry by Jonathan Davis.

diff --git a/Makefile.in b/Makefile.in
index 3756681a1ab63305eb2402291d77c544097458a7..6ebdd35fb93a717eccedd34a75a37d4993082eb3 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -75,7 +75,7 @@ infodir='$(infodir)' mandir='$(mandir)' manext='$(manext)'
 SUBDIRS = src doc po util windows
 
 # default target
-all: libtool src/config.h Makefile $(SUBDIRS)
+all: libtool src/config.h Makefile configure.bat $(SUBDIRS)
 
 check: all
 
@@ -102,6 +102,10 @@ install.mo:
 libtool: $(LIBTOOL_DEPS)
        $(SHELL) ./config.status --recheck
 
+# Create configure.bat from configure.bat.in by DOS-ifying the lines.
+configure.bat: configure.bat.in
+       awk '{ print $$0 ($$0 ~ /\r$$/ ? "" : "\r") }' $@.in > $@
+
 # create tag files for Emacs
 TAGS:
        cd src && $(MAKE) $@

diff --git a/configure.bat b/configure.bat
deleted file mode 100644 (file)
index 9864659..0000000
--- a/configure.bat
+++ /dev/null
@@ -1,62 +0,0 @@
-@echo off
-rem Configure batch file for `Wget' utility
-rem Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
-
-rem This program is free software; you can redistribute it and/or modify
-rem it under the terms of the GNU General Public License as published by
-rem the Free Software Foundation; either version 2 of the License, or
-rem (at your option) any later version.
-
-rem This program is distributed in the hope that it will be useful,
-rem but WITHOUT ANY WARRANTY; without even the implied warranty of
-rem MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-rem GNU General Public License for more details.
-
-rem You should have received a copy of the GNU General Public License
-rem along with this program; if not, write to the Free Software
-rem Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-cls
-if .%1 == .--borland goto :borland
-if .%1 == .--msvc goto :msvc
-if .%1 == .--watcom goto :watcom
-if not .%BORPATH% == . goto :borland
-if not .%1 == . goto :usage
-
-:msvc
-copy windows\config.h.ms src\config.h > nul
-copy windows\Makefile.top Makefile > nul
-copy windows\Makefile.src src\Makefile > nul
-copy windows\Makefile.doc doc\Makefile > nul
-
-echo Type NMAKE to start compiling.
-echo If it doesn't work, try executing MSDEV\BIN\VCVARS32.BAT first,
-echo and then NMAKE.
-goto :end
-
-:borland
-copy windows\config.h.bor src\config.h > nul
-copy windows\Makefile.top.bor Makefile > nul
-copy windows\Makefile.src.bor src\Makefile > nul
-copy windows\Makefile.doc doc\Makefile > nul
-
-echo Type MAKE to start compiling.
-goto :end
-
-:watcom
-copy windows\config.h.ms src\config.h > nul
-copy windows\Makefile.watcom src\Makefile > nul
-
-@echo Checking environment vars
-@set INCLUDE | find /I "WATCOM"
-@set LIB     | find /I "WATCOM"
-@echo If WATCOM directories were not displayed, you need to
-@echo SET INCLUDE and SET LIB to the Watcom directories
-@echo.
-cd src
-@echo Type WMAKE to build
-goto :end
-
-:usage
-echo Usage: Configure [--borland | --msvc | --watcom]
-:end

diff --git a/configure.bat.in b/configure.bat.in
new file mode 100644 (file)
index 0000000..9864659
--- /dev/null
+++ b/configure.bat.in
@@ -0,0 +1,62 @@
+@echo off
+rem Configure batch file for `Wget' utility
+rem Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+
+rem This program is free software; you can redistribute it and/or modify
+rem it under the terms of the GNU General Public License as published by
+rem the Free Software Foundation; either version 2 of the License, or
+rem (at your option) any later version.
+
+rem This program is distributed in the hope that it will be useful,
+rem but WITHOUT ANY WARRANTY; without even the implied warranty of
+rem MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+rem GNU General Public License for more details.
+
+rem You should have received a copy of the GNU General Public License
+rem along with this program; if not, write to the Free Software
+rem Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+cls
+if .%1 == .--borland goto :borland
+if .%1 == .--msvc goto :msvc
+if .%1 == .--watcom goto :watcom
+if not .%BORPATH% == . goto :borland
+if not .%1 == . goto :usage
+
+:msvc
+copy windows\config.h.ms src\config.h > nul
+copy windows\Makefile.top Makefile > nul
+copy windows\Makefile.src src\Makefile > nul
+copy windows\Makefile.doc doc\Makefile > nul
+
+echo Type NMAKE to start compiling.
+echo If it doesn't work, try executing MSDEV\BIN\VCVARS32.BAT first,
+echo and then NMAKE.
+goto :end
+
+:borland
+copy windows\config.h.bor src\config.h > nul
+copy windows\Makefile.top.bor Makefile > nul
+copy windows\Makefile.src.bor src\Makefile > nul
+copy windows\Makefile.doc doc\Makefile > nul
+
+echo Type MAKE to start compiling.
+goto :end
+
+:watcom
+copy windows\config.h.ms src\config.h > nul
+copy windows\Makefile.watcom src\Makefile > nul
+
+@echo Checking environment vars
+@set INCLUDE | find /I "WATCOM"
+@set LIB     | find /I "WATCOM"
+@echo If WATCOM directories were not displayed, you need to
+@echo SET INCLUDE and SET LIB to the Watcom directories
+@echo.
+cd src
+@echo Type WMAKE to build
+goto :end
+
+:usage
+echo Usage: Configure [--borland | --msvc | --watcom]
+:end