X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9f2d09aad264fd6d2b9731aad440b97bd8e24e75..bf44306ebca5d26e204ef17851516d844bc2f0a7:/docs/gtk/install.txt

diff --git a/docs/gtk/install.txt b/docs/gtk/install.txt
index 838b2bd455..ab54619608 100644
--- a/docs/gtk/install.txt
+++ b/docs/gtk/install.txt
@@ -1,7 +1,7 @@
 
   !!! When sending bug reports tell us what version of wxWindows you are 
       using (including the beta) and what compiler on what system. One 
-      example: wxGTK 2.1 beta 6, egcs 1.1.1, Redhat 5.0 !!!
+      example: wxGTK 2.3.0, egcs 1.1.1, Redhat 6.2 !!!
 
 * The most simple case
 -----------------------
@@ -151,10 +151,10 @@ START-UP! Just always use egcs and be happy.
 
 Please send comments and question about the OS/2 installation
 to Andrea Venturoli <a.ventu@flashnet.it> and patches to
-make to me (Robert Roebling) or the wxWindows mailing list.
+the wxWindows mailing list.
 
 You'll need OS/2 Warp (4.00FP#6), X-Free86/2 (3.3.3 or newer), 
-GTK+ (1.2.1 or newer), emx (0.9d fix 1), flex (2.5.4), yacc (1.8), 
+GTK+ (1.2.5 or newer), emx (0.9d fix 1), flex (2.5.4), yacc (1.8), 
 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).
@@ -169,10 +169,20 @@ SET COMSPEC=sh
 
 Notice you can choose whatever you want, if you don't like OS2X.
 
-After running configure, you'll have to apply to modifications manually
-to the created Makefile:
-- Replace all ":" with ";" in the VPATH variable
-- Replace "ley.yy.c" with "lexyy.c"
+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-gtk
+as described above.
+
+If you have pthreads library installed, but have a gtk version
+which does not yet support threading, you need to explicitly
+diable threading by using the option --disable-threads.
+
+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 wxGTK on SGI
 --------------------------
@@ -230,15 +240,12 @@ Given below are the commands to change the default behaviour,
 i.e. if it says "--disable-threads" it means that threads
 are enabled by default.
 
-Many of the confiugre options have been thoroughly tested
-in wxWindows snapshot 6, but not yet all (ODBC not).
-
 Normally, you won't have to choose a toolkit, because when
 you download wxGTK, it will default to --with-gtk etc. But
 if you use all of our CVS repository you have to choose a 
 toolkit. You must do this by running configure with either of:
 
-        --without-gtk            Don't use the GIMP ToolKit (GTK)
+    --without-gtk            Don't use the GIMP ToolKit (GTK)
 	
 	--with-motif             Use either Motif or Lesstif
 	                         Configure will look for both. 
@@ -251,14 +258,14 @@ The following options handle the kind of library you want to build.
 
 	--enable-static         Create static libraries.
 
-	--disable-optimise	Do not optimise the code. Can
+	--disable-optimise	    Do not optimise the code. Can
 	                        sometimes be useful for debugging
 				and is required on some architectures
 				such as Sun with gcc 2.8.X which
 				would otherwise produce segvs.
 
 	--enable-profile        Add profiling info to the object 
-				files. Currently broken, I think.
+				            files. Currently broken, I think.
 				
 	--enable-no_rtti        Enable compilation without creation of
 	                        C++ RTTI information in object files. 
@@ -276,18 +283,18 @@ The following options handle the kind of library you want to build.
 				
 	--enable-permissive     Enable compilation without creation of
 	                        giving erros as soon as you compile with
-				Solaris' ANSI-defying headers...
+				            Solaris' ANSI-defying headers.
 				
 	--enable-mem_tracing    Add built-in memory tracing.
 				
 	--enable-dmalloc        Use the dmalloc memory debugger.
 	                        Read more at www.letters.com/dmalloc/
 				
-	--enable-debug_info	Add debug info to object files and
+	--enable-debug_info	    Add debug info to object files and
 	                        executables for use with debuggers
-				such as gdb (or its many frontends).
+				            such as gdb (or its many frontends).
 
-	--enable-debug_flag	Define __DEBUG__ and __WXDEBUG__ when
+	--enable-debug_flag	    Define __DEBUG__ and __WXDEBUG__ when
 	                        compiling. This enable wxWindows' very
 				useful internal debugging tricks (such
 				as automatically reporting illegal calls)
@@ -298,28 +305,29 @@ The following options handle the kind of library you want to build.
 * Feature Options
 -------------------
 
-Many of the confiugre options have been thoroughly tested
-in wxWindows snapshot 6, but not yet all (ODBC not).
-
 When producing an executable that is linked statically with wxGTK
 you'll be surprised at its immense size. This can sometimes be
 drastically reduced by removing features from wxWindows that 
 are not used in your program. The most relevant such features
 are
 
-	--without-libpng	Disables PNG image format code.
+	--with-odbc             Enables ODBC code. This is disabled
+                            by default because iODBC is under the
+                            L-GPL license.
 	
-	--without-libjpeg	Disables JPEG image format code.
+	--without-libpng	    Disables PNG image format code.
 	
-	--disable-pnm		Disables PNM image format code.
+	--without-libjpeg	    Disables JPEG image format code.
 	
-	--disable-gif		Disables GIF image format code.
+	--without-libtiff	    Disables TIFF image format code.
+    
+	--disable-pnm		    Disables PNM image format code.
 	
-	--disable-pcx		Disables PCX image format code.
+	--disable-gif		    Disables GIF image format code.
 	
-	--without-odbc          Disables ODBC code.
+	--disable-pcx		    Disables PCX image format code.
 	
-        --disable-resources     Disables the use of *.wxr type
+    --disable-resources     Disables the use of *.wxr type
 	                        resources.
 		
 	--disable-threads       Disables threads. Will also
@@ -381,7 +389,7 @@ You can remove any traces of wxWindows by typing
 If you want to save disk space by removing unnecessary
 object-files:
 
-	 make clean
+	    make clean
 
 in the various directories will do the work for you.
 
@@ -391,12 +399,12 @@ in the various directories will do the work for you.
 1) The first way uses the installed libraries and header files
 automatically using wx-config
 
-g++ myfoo.cpp `wx-config --libs` `wx-config --cflags` -o myfoo
+gcc myfoo.cpp `wx-config --cflags --libs` -o myfoo
 
 Using this way, a make file for the minimal sample would look
 like this
 
-CC = g++
+CC = gcc
 
 minimal: minimal.o
     $(CC) -o minimal minimal.o `wx-config --libs` 
@@ -420,6 +428,5 @@ and configure before you can type make.
 
 In the hope that it will be useful,
 
-        Robert Roebling <roebling@sun2.ruf.uni-freiburg.de>
-	
-	
+        Robert Roebling
+