X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/75fcbf8e16c6b1cf177e7471b9cc27f97edb3c94..a4f5b9b9a3195fc0d616724317171a5924f9da54:/docs/x11/install.txt?ds=sidebyside

diff --git a/docs/x11/install.txt b/docs/x11/install.txt
index b17a6c10d7..a3543c69f6 100644
--- a/docs/x11/install.txt
+++ b/docs/x11/install.txt
@@ -11,7 +11,7 @@ IMPORTANT NOTE:
 
   When sending bug reports tell us what version of wxWindows you are 
   using (including the beta) and what compiler on what system. One 
-  example: wxX11 2.5.0, gcc 2.95.4, Redhat 6.2
+  example: wxX11 2.5.1, gcc 2.95.4, Redhat 6.2
 
 First steps
 -----------
@@ -161,44 +161,44 @@ exit
 ------------------------
 
 Please send comments and question about the OS/2 installation
-to Andrea Venturoli <a.ventu@flashnet.it> and patches to
+to Stefan Neis <Stefan.Neis@t-online.de> and patches to
 the wxWindows mailing list.
 
-You'll need OS/2 Warp (4.00FP#6), X-Free86/2 (3.3.3 or newer), 
-emx (0.9d fix 1), flex (2.5.4), yacc (1.8), unix like shell,
-e.g. korn shell (5.2.13), Autoconf (2.13),  GNU file utilities (3.6),
-GNU text utilities (1.3), GNU shell utilites (1.12), m4 (1.4), 
-sed (2.05), grep (2.0), Awk (3.0.3), GNU Make (3.76.1).
+In the following list, the version numbers indicate the configuration that
+was actually used by myself, newer version should cause no problems and
+even older ones are expected to work most of the time.
 
-Open an OS/2 prompt and switch to the directory above.
-First set some global environment variables we need:
+You'll need OS/2 Warp (4.51) or eCS(1.0), X-Free86/2 (3.3.6 or newer),
+emx (0.9d fix 4), flex (2.5.4), yacc (1.8) or bison (1.25),
+a Unix like shell (pdksh-5.2.14 or ash), Autoconf (2.57), GNU file
+utilities (3.13), GNU text utilities (1.19), GNU shell utilites (1.12),
+m4 (1.4), sed (2.05), grep (2.0), Awk (3.0.3), GNU Make (3.75).
+
+Preferably, you should have Posix/2 installed and C(PLUS)_INCLUDE_PATH and
+LIBRARY_PATH set up accordingly, however, wxGTK will even work without it.
+Presence of Posix/2 will be auto-detected.
 
-SET CXXFLAGS=-Zmtd -D__ST_MT_ERRNO__
-SET CFLAGS=-Zmtd -D__ST_MT_ERRNO__
-SET OSTYPE=OS2X              
-SET COMSPEC=sh
+Open an OS/2 prompt and switch to the directory above.
+Set MAKESHELL (and depending on your installation also INSTALL, for me
+it tends to try to use the system's tcpip\pcomos\install.exe which causes
+problems...) to a Unix like shell, e.g.
+SET MAKESHELL=ash
 
-Notice you can choose whatever you want, if you don't like OS2X.
+Be warned that depending on the precise version of your make, the
+variable that needs to be set might be MAKE_SHELL instead of MAKESHELL.
+If you have a really deficient version of GNU make, it might even be
+necessary to set SHELL or even COMSPEC to a unix like shell as well. 
 
-Now, run autoconf in the main directory and in the samples, demos
-and utils subdirectory. This will generate the OS/2 specific
-versions of the configure scripts. Now run
-    configure --with-x11
-as described above.
+Notice that the delivered configure scripts are fully OS/2 aware, so you
+can simply run
+    ash -c "configure --with-x11"
+and make and possibly make install as described above.
 
 To verify X11 installation, configure will try to compile a
 sample program that requires X headers/libraries to be either
 available via C_INCLUDE_PATH and LIBRARY_PATH or you need to
 explicitly set CFLAGS prior to running configure.
 
-If you have pthreads library installed, it will be autodetected
-and the library will be compiled with thread-support.
-
-Note that configure assumes your flex will generate files named
-"lexyy.c", not "lex.yy.c". If you have a version which does
-generate "lex.yy.c", you need to manually change the generated
-makefile.
-
 * Building wxX11 on SGI
 -----------------------