From 51d55e1c0cb6d783164f5c8550f424ea3b49c051 Mon Sep 17 00:00:00 2001 From: Robert Roebling Date: Tue, 15 Jun 1999 21:46:57 +0000 Subject: [PATCH] Automake fix. Docs. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2798 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- distrib/gtk/copy_src | 1 + docs/gtk/install.txt | 21 +++++++++++---------- docs/gtk/readme.txt | 9 +++++---- docs/gtk/todo.txt | Bin 866 -> 1232 bytes include/wx/Makefile.am | 1 - 5 files changed, 17 insertions(+), 15 deletions(-) diff --git a/distrib/gtk/copy_src b/distrib/gtk/copy_src index 6e5097b0b6..b405cdc96d 100755 --- a/distrib/gtk/copy_src +++ b/distrib/gtk/copy_src @@ -18,6 +18,7 @@ cp wxGTK.spec ~/wxgtk_dist/wxGTK cp Makefile.am ~/wxgtk_dist/wxGTK cp acconfig.h ~/wxgtk_dist/wxGTK cp aclocal.m4 ~/wxgtk_dist/wxGTK +cp acinclude.m4 ~/wxgtk_dist/wxGTK cp configure.in ~/wxgtk_dist/wxGTK cp configure ~/wxgtk_dist/wxGTK cp config.sub ~/wxgtk_dist/wxGTK diff --git a/docs/gtk/install.txt b/docs/gtk/install.txt index 25b890d49a..347560e521 100644 --- a/docs/gtk/install.txt +++ b/docs/gtk/install.txt @@ -33,8 +33,8 @@ of wxWindows - you may also want to create different versions of wxWindows and test them concurrently. Most typically, this would be a version configured with --enable-debug_flag and one without. Note, that only one build can currently be installed, so you'd have to use local version of the library for that purpose. -For building three version, one GTK, one Motif and a debug version of the GTK -source, you'd do this: +For building three versions (one GTK, one Motif and a debug version of the GTK +source) you'd do this: md buildmotif cd buildmotif @@ -50,7 +50,7 @@ cd .. md buildgtkd cd buildgtkd -../configure --with-gtk --enable-debug +../configure --with-gtk --enable-debug_flag make cd .. @@ -58,8 +58,8 @@ cd .. ------------------------ configure reports, that you don't have GTK 1.X installed although you are -certainly sure you have. Well, you have installed it, but you also have another -version of the GTK installed, which you may need to removed including other +very sure you have. Well, you have installed it, but you also have another +version of the GTK installed, which you may need to remove including other versions of glib (and its headers). Also, look for the PATH variable and check if it includes the path to the correct gtk-config! The check your LDPATH if it points to the correct library. There is no way to compile wxGTK if configure @@ -104,14 +104,14 @@ YOU USE AND WHAT ERROR WAS REPORTED. I know this has no effect, but I tried... wxWindows/GTK requires the GTK+ library to be installed on your system. It has to be a stable version, preferebly version 1.2.3. You can use GTK 1.0 in connection -with wxWindows, but only without Drag'n'Drop. wxWindows does work with the 1.1.X +with wxWindows, albeit without Drag'n'Drop. wxWindows does work with the 1.1.X versions of the GTK+ library. You can get the newest version of the GTK+ from the GTK homepage at: http://www.gtk.org -We also mirror GTK+ 1.2.1 at my ftp site soon. You'll find information about downloading +We also mirror GTK+ 1.0.6 at my ftp site. You'll find information about downloading at my homepage. * Additional libraries @@ -265,7 +265,7 @@ The following options handle the kind of library you want to build. ------------------- The confiugre options have not yet been thoroughly tested -in wxWindows snapshot 6. +in wxWindows snapshot 6. ODBC not at all. When producing an executable that is linked statically with wxGTK you'll be surprised at its immense size. This can sometimes be @@ -314,7 +314,7 @@ make yourself some coffee, as it will take some time. On an old 386SX possibly two weeks. During compilation, you'll get a few warning messages depending in your compiler. -if you want to be more selective, you can change into a specific +If you want to be more selective, you can change into a specific directiry and type "make" there. Then you may install the library and it's header files under @@ -367,11 +367,12 @@ the usual number of GNU tools, at least GNU automake version 1.4 GNU autoheader version 2.14 GNU autoconf version 2.14 +GNU libtool version 1.3 and quite possibly GNU make -GNU cc +GNU C++ and if you have all this then you probably know enough to go ahead yourself :-) diff --git a/docs/gtk/readme.txt b/docs/gtk/readme.txt index e3f3a23cf7..047ebc5d8b 100644 --- a/docs/gtk/readme.txt +++ b/docs/gtk/readme.txt @@ -6,12 +6,13 @@ the wxWindows GUI library. This is a developers release and is it not suited for production development. Beware that major changes can happen before a final release. -Beginning from snapshot 6 wxWindows uses a completely +Beginning with snapshot 6, wxWindows uses a completely new make file system on Unix that uses GNU automake, GNU autoconf and GNU autoheader. You do not need these programs in order to use the library, but for taking part in its development, they are required. Read the -INSTALL.txt file for learning what you can do with it. +INSTALL.txt file for learning what you can do with the +new configure/automake/libtool system. More information is available from my homepage at: @@ -48,8 +49,8 @@ once a binary incompatible version of wxWindows/Gtk comes out we'll augment the library version number to avoid linking problems. Please send problems concerning installation, feature requests, -bug reports or comments to the wxWindows users Information on -how to subscribe is available from my homepage. +bug reports or comments to the wxWindows users list. Information +on how to subscribe is available from my homepage. wxWindows/Gtk doesn't come with any guarantee whatsoever. It might crash your harddisk or destroy your monitor. It doesn't claim to be diff --git a/docs/gtk/todo.txt b/docs/gtk/todo.txt index 60b2b0d642ece9f969e2f6f660447c08e335cd9a..96bce1ccb83bcb4b4efd936103f8b72e2298a6bf 100644 GIT binary patch literal 1232 zcma)6O>5gg5WVYH%q>Y{3(`~Rp(WTPF-_XEPUv~19ZQQ>J7RYf+5Po>E4!oxLn;i$ z-kq5@??c7>#6x$kX{nD+qSHN{xG|p>#f=NbyTr5%OS*nsl?4?K5}A~fy3mkp=sCDr zEK?f#UZR#o@s&p!cWd{HBh}udM6T;ScO2BHlYlD^X3P1G)LYg>qr@#qAmcst-snbR zhg(abBpqv;N0~|nrO4Y5Gd`Faz`eS0Wu)3 zr!5KiQOIaJ1oqq*G-_CtcY3S=lQcD~1^b9kq=Jw5%EaTSr`633wI*24v7|MKkiehm z{LTfP5jfEdYSn>?7oO43Tcc1WF9iz0b1G>Sl4erhm7UPWc}^3fBe&QN)eFhWDEmF| zcj!ZC%Mq&6kW9l_;Kk)7IY|n7yM&sxXYOaj1}H}3x1dc2yT?~+GLS68EXxR$oC!i$ z0T)wC7@r%QG8;Xxbwl^2BiF5rWa=8MMx&tl$RBxAF<8vAOsxZ!-oM%|i_wAc`6pU{ z(I)E`==SLgU6t?YJPDxbS%PWE>7*Y1zbI)58@PJ#a5dyQiTfUS-iQ(5DSjYt3WK{Q zV0zthy{%-&=_AI~FlUQ%9JW)e9Lx&SHnYhR>iR^r31>n}4kD~ZC29C>U#tHej zyLU+!8vR6uVD*?&f!!aWVh`G{?TwW&*<3zvd|uAPE!X>o}{QmR5xYI#v+Nl9v+LRx;2f_sR!wt}IakseS! zIYS{OKQC2}OJVW^rjN1=NI(GyxRCe^liQemB)Jmv)WK#Jrlve~K=A;6hilTgS9gC(ks@bUWp)8s_$nqc!Nyq|d t7CPtW7o-*?mSpDVDU@fHWGDopdIni5lnwSycz$V43MfSLGLwOU1^};xI