--- gforth/configure.cmd	1996/10/06 22:24:15	1.1
+++ gforth/configure.cmd	2003/03/09 15:16:46	1.12
@@ -1,50 +1,78 @@
-@echo off
-/* Copyright 1995 Free Software Foundation, Inc.
+/*
+Copyright (C) 1996,1997,1998,2000 Free Software Foundation, Inc.
 
- This file is part of Gforth.
+This file is part of Gforth.
 
- Gforth 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 (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., 675 Mass Ave, Cambridge, MA 02139, USA.
+Gforth 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 (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., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
 */
-echo *** Configuring for OS/2 with EMX 3.0 GNU C ***
-THREAD = i
-FREGS = n
-:switches
-IF "%1"=="--enable-direct-threaded" then THREAD=d
-IF "%1"=="--enable-indirect-threaded" then THREAD=i
-IF "%1"=="--enable-force-reg" then FREGS=y
-shift
-if "%1"!="" goto switches
+say "*** Configuring for OS/2 with EMX 3.0 GNU C ***"
+
+parse arg args
+
+THREAD="i"
+FREGS="n"
+
+do while args \== ""
+   parse var args arg args
+
+   select
+      when arg="--enable-direct-threaded" then THREAD="d"
+      when arg="--enable-indirect-threaded" then THREAD="i"
+      when arg="--enable-force-reg" then FREGS="y"
+      when arg="--help" then do
+        say "--enable and --with options recognized:"
+        say "  --enable-force-reg      Use explicit register declarations if they appear in"
+        say "                          the machine.h file. This can cause a good speedup,"
+        say "                          but also incorrect code with some gcc versions on"
+        say "                          some processors (default disabled)."
+        say "  --enable-direct-threaded      Force direct threading. This may not work on"
+        say "                                some machines and may cause slowdown on others."
+        say "                                (default processor-dependent)"
+        say "  --enable-indirect-threaded    Force indirect threading. This can cause a"
+        say "                                slowdown on some machines."
+        say "                                (default processor-dependent)"
+      end
+    otherwise
+      do
+        say "*** Unknown option:" arg
+        call Usage
+      end
+  end
+
+end
+
 copy makefile.os2 makefile
+copy "engine\makefile.os2" "engine\makefile"
 copy kernl32l.fi kernel.fi
-copy 386.h machine.h
-copy os2conf.h config.h
-copy startup.fs startup.unx
-copy startup.dos startup.fs
-copy history.dos history.fs
-if THREAD == 'i' then do
-	ECHO #ifndef INDIRECT_THREADED >>config.h
-	ECHO #define INDIRECT_THREADED 1 >>config.h
-	ECHO #endif >>config.h
+copy envos.os2 envos.fs
+copy os2conf.h "engine\config.h"
+if THREAD="i" THEN DO
+	call lineout "engine\config.h", "#ifndef INDIRECT_THREADED"
+	call lineout "engine\config.h", "#define INDIRECT_THREADED 1"
+	call lineout "engine\config.h", "#endif"
 end
-if THREAD == 'd' then do
-	ECHO #ifndef DIRECT_THREADED >>config.h
-	ECHO #define DIRECT_THREADED 1 >>config.h
-	ECHO #endif >>config.h
+IF THREAD="d" THEN do
+	call lineout "engine\config.h", "#ifndef DIRECT_THREADED"
+	call lineout "engine\config.h", "#define DIRECT_THREADED 1" 
+	call lineout "engine\config.h", "#endif"
 end
-if FREGS == 'y' then do
-	ECHO #ifndef FORCE_REG >>config.h
-	ECHO #define FORCE_REG 1 >>config.h
-	ECHO #endif >>config.h
+IF FREGS="y" THEN do
+	call lineout "engine\config.h", "#ifndef FORCE_REG"
+	call lineout "engine\config.h", "#define FORCE_REG 1"
+	call lineout "engine\config.h", "#endif"
 end
+call lineout version.h1, 'static char gforth_version[]="0.4.0";'
+call lineout "kernel\version.fs", ': version-string s" 0.4.0" ;'
+call lineout 'version-stamp', '0.4.0'