Reflect new --with-gtk=VERSION syntax.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33674 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/docs/gtk/install.txt b/docs/gtk/install.txt
index 323b695278a1074b1ffac1ac93a397bdd3ce9e91..ed7ff17a32c5beea23060ef7643b09c43955de17 100644 (file)
--- a/docs/gtk/install.txt
+++ b/docs/gtk/install.txt
@@ -247,9 +247,8 @@ 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:
 
 if you use all of our CVS repository you have to choose a
 toolkit. You must do this by running configure with either of:
 

-    --with-gtk              Use the GIMP ToolKit (GTK+). Default.
-    --with-gtk2             Use the GTK+ 2.0. Default.
-    --with-gtk1             Use the GTK+ 1.2. Default.
+    --with-gtk=2            Use the GTK+ 2.0. Default.
+    --with-gtk=1            Use the GTK+ 1.2.

     --with-motif            Use either Motif or Lesstif
                             Configure will look for both.
 
     --with-motif            Use either Motif or Lesstif
                             Configure will look for both.
 

diff --git a/docs/gtk/readme.txt b/docs/gtk/readme.txt
index 0b74d643b8381b5bfdde0fd24a676c5db77619e6..43ddd06918ade53d2fb3cc9e41a03218f5c3b9a6 100644 (file)
--- a/docs/gtk/readme.txt
+++ b/docs/gtk/readme.txt
@@ -22,16 +22,16 @@ many systems:
 
     mkdir build_gtk
     cd build_gtk
 
     mkdir build_gtk
     cd build_gtk

-    ../configure --with-gtk2
+    ../configure --with-gtk=2

     make
     su <type root password>
     make install
     ldconfig
 
     make
     su <type root password>
     make install
     ldconfig
 

-In order to use wxGTK with GTK 1.2 you need to use --with-gtk1
+In order to use wxGTK with GTK 1.2 you need to use --with-gtk=1

 configure option. To build the library in Unicode mode (all
 strings will be wide strings and so on) you need to configure
 configure option. To build the library in Unicode mode (all
 strings will be wide strings and so on) you need to configure

-with GTK 2.0 and add --enable-unicode (default by now).
+with GTK 2.0 and add --enable-unicode.

 
 Please note that it is strongly advised to build the library in
 a separate directory, as shown above, as it allows you to have
 
 Please note that it is strongly advised to build the library in
 a separate directory, as shown above, as it allows you to have

diff --git a/wxGTK_RR.spec b/wxGTK_RR.spec
index 2dc9737cba0b02faec0309471899a63cb0030be5..0ea9a844dfc41696febdfda0eebb2cb7b2e3b1e0 100644 (file)
--- a/wxGTK_RR.spec
+++ b/wxGTK_RR.spec
@@ -166,9 +166,9 @@ mkdir obj-shared
 cd obj-shared
 ../configure --prefix=%{_prefix} \
 %if ! %{gtk2}
 cd obj-shared
 ../configure --prefix=%{_prefix} \
 %if ! %{gtk2}

-                             --disable-gtk2 \
+                             --with-gtk=1 \

 %else
 %else

-                             --enable-gtk2 \
+                             --with-gtk=2 \

 %endif
 %if %{unicode}
                              --enable-unicode \
 %endif
 %if %{unicode}
                              --enable-unicode \


@@ -200,9 +200,9 @@ mkdir obj-static
 cd obj-static
 ../configure --prefix=%{_prefix} \
 %if ! %{gtk2}
 cd obj-static
 ../configure --prefix=%{_prefix} \
 %if ! %{gtk2}

-                             --disable-gtk2 \
+                             --with-gtk=1 \

 %else
 %else

-                             --enable-gtk2 \
+                             --with-gtk=2 \

 %endif
                              --disable-shared \
 %if %{unicode}
 %endif
                              --disable-shared \
 %if %{unicode}