Replace --disable-gtk2 with --with-gtk1 and --with-gtk2

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

diff --git a/configure b/configure
index 9880f3405575c554b7697acc77a862c25e04e361..8d98e02cf56c5d11ebf99da8da4a04a4237f30bb 100755 (executable)
--- a/configure
+++ b/configure
@@ -872,7 +872,6 @@ Optional Features:
   --enable-plugins        build parts of wxWidgets as loadable components
   --enable-universal      use wxWidgets GUI controls instead of native ones
   --enable-nanox          use NanoX
-  --disable-gtk2          use GTK+ 1.2 instead of 2.0
   --enable-gpe            use GNOME PDA Environment features if possible
   --enable-shared         create shared library code
   --enable-optimise       create optimised code
@@ -1053,7 +1052,9 @@ Optional Features:
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --with-gtk              use GTK+
+  --with-gtk              use GTK+ (currently uses 2.0)
+  --with-gtk1             use GTK+ 1.2
+  --with-gtk2             use GTK+ 2.0
   --with-motif            use Motif/Lesstif
   --with-mac              use Mac OS X
   --with-cocoa            use Cocoa
@@ -2222,6 +2223,9 @@ if test $DEBUG_CONFIGURE = 1; then
   DEFAULT_wxUSE_MONOLITHIC=no
   DEFAULT_wxUSE_PLUGINS=no
   DEFAULT_wxUSE_OFFICIAL_BUILD=no
+
+  DEFAULT_wxUSE_GTK1=no
+  DEFAULT_wxUSE_GTK2=no
 else
   DEFAULT_wxUSE_UNIVERSAL=no
   DEFAULT_wxUSE_STL=no
@@ -2420,7 +2424,8 @@ else
   DEFAULT_wxUSE_PLUGINS=no
   DEFAULT_wxUSE_OFFICIAL_BUILD=no
 
-    DEFAULT_wxUSE_GTK2=yes
+    DEFAULT_wxUSE_GTK1=no
+  DEFAULT_wxUSE_GTK2=no
 fi
 
 
@@ -2609,6 +2614,88 @@ if test "${with_gtk+set}" = set; then
   wxUSE_GTK="$withval" CACHE_GTK=1 TOOLKIT_GIVEN=1
 fi;
 
+          echo "$as_me:$LINENO: checking for --with-gtk1" >&5
+echo $ECHO_N "checking for --with-gtk1... $ECHO_C" >&6
+          no_cache=0
+
+# Check whether --with-gtk1 or --without-gtk1 was given.
+if test "${with_gtk1+set}" = set; then
+  withval="$with_gtk1"
+
+                        if test "$withval" = yes; then
+                          ac_cv_use_gtk1='wxUSE_GTK1=yes'
+                        else
+                          ac_cv_use_gtk1='wxUSE_GTK1=no'
+                        fi
+
+else
+
+                        LINE=`grep "wxUSE_GTK1" ${wx_arg_cache_file}`
+                        if test "x$LINE" != x ; then
+                          eval "DEFAULT_$LINE"
+                        else
+                          no_cache=1
+                        fi
+
+                        ac_cv_use_gtk1='wxUSE_GTK1='$DEFAULT_wxUSE_GTK1
+
+fi;
+
+          eval "$ac_cv_use_gtk1"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_gtk1 >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_GTK1" = yes; then
+            echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+          else
+            echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+          fi
+
+
+          echo "$as_me:$LINENO: checking for --with-gtk2" >&5
+echo $ECHO_N "checking for --with-gtk2... $ECHO_C" >&6
+          no_cache=0
+
+# Check whether --with-gtk2 or --without-gtk2 was given.
+if test "${with_gtk2+set}" = set; then
+  withval="$with_gtk2"
+
+                        if test "$withval" = yes; then
+                          ac_cv_use_gtk2='wxUSE_GTK2=yes'
+                        else
+                          ac_cv_use_gtk2='wxUSE_GTK2=no'
+                        fi
+
+else
+
+                        LINE=`grep "wxUSE_GTK2" ${wx_arg_cache_file}`
+                        if test "x$LINE" != x ; then
+                          eval "DEFAULT_$LINE"
+                        else
+                          no_cache=1
+                        fi
+
+                        ac_cv_use_gtk2='wxUSE_GTK2='$DEFAULT_wxUSE_GTK2
+
+fi;
+
+          eval "$ac_cv_use_gtk2"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_gtk2 >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_GTK2" = yes; then
+            echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+          else
+            echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+          fi
+
+
 # Check whether --with-motif or --without-motif was given.
 if test "${with_motif+set}" = set; then
   withval="$with_motif"
@@ -2705,47 +2792,6 @@ echo "${ECHO_T}no" >&6
 
 
 
-         enablestring=
-          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-gtk2" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-gtk2... $ECHO_C" >&6
-          no_cache=0
-          # Check whether --enable-gtk2 or --disable-gtk2 was given.
-if test "${enable_gtk2+set}" = set; then
-  enableval="$enable_gtk2"
-
-                          if test "$enableval" = yes; then
-                            ac_cv_use_gtk2='wxUSE_GTK2=yes'
-                          else
-                            ac_cv_use_gtk2='wxUSE_GTK2=no'
-                          fi
-
-else
-
-                          LINE=`grep "wxUSE_GTK2" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
-                          ac_cv_use_gtk2='wxUSE_GTK2='$DEFAULT_wxUSE_GTK2
-
-fi;
-
-          eval "$ac_cv_use_gtk2"
-          if test "$no_cache" != 1; then
-            echo $ac_cv_use_gtk2 >> ${wx_arg_cache_file}.tmp
-          fi
-
-          if test "$wxUSE_GTK2" = yes; then
-            echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-          else
-            echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-          fi
-
-
          enablestring=
           echo "$as_me:$LINENO: checking for --${enablestring:-enable}-gpe" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-gpe... $ECHO_C" >&6
@@ -10484,6 +10530,11 @@ if test "$wxUSE_WINE" = "yes"; then
     wxUSE_SHARED=no
 fi
 
+if test "$wxUSE_GTK1" = "yes" -o "$wxUSE_GTK2" = "yes"; then
+    wxUSE_GTK=yes
+    TOOLKIT_GIVEN=1
+fi
+
 if test "$wxUSE_GUI" = "yes"; then
 
     if test "$USE_BEOS" = 1; then
@@ -24281,7 +24332,11 @@ echo "${ECHO_T}" >&6
                     GTK_MODULES=gthread
                 fi
 
-                                                wx_cv_lib_gtk=
+                                if test "x$wxUSE_GTK1" != "xyes" -a "x$wxUSE_GTK2" != "xyes"; then
+                    wxUSE_GTK2=yes
+                fi
+
+                                wx_cv_lib_gtk=
                 if test "x$wxUSE_GTK2" = "xyes"; then
                     # Check whether --enable-gtktest or --disable-gtktest was given.
 if test "${enable_gtktest+set}" = set; then
@@ -24585,7 +24640,9 @@ rm -f conftest.err conftest.$ac_objext \
 
   rm -f conf.gtktest
 
-                else
+                fi
+
+                                if test -z "$wx_cv_lib_gtk" -a "x$wxUSE_GTK1" = "xyes"; then
 
 # Check whether --with-gtk-prefix or --without-gtk-prefix was given.
 if test "${with_gtk_prefix+set}" = set; then
@@ -25243,16 +25300,20 @@ echo "${ECHO_T}$wx_cv_lib_gtk" >&6
             1.2.3)  WXGTK12=1
                     ;;
             *)      { { echo "$as_me:$LINENO: error:
-Please check that gtk-config is in path, the directory
-where GTK+ libraries are installed (returned by
-'gtk-config --libs' command) is in LD_LIBRARY_PATH or
-equivalent variable and GTK+ is version 1.2.3 or above.
+The development files for GTK+ were not found. For GTK+ 2, please
+ensure that pkg-config is in the path and that gtk+-2.0.pc is
+installed. For GTK+ 1.2 please check that gtk-config is in the path,
+and that the version is 1.2.3 or above. Also check that the
+libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config
+--libs' are in the LD_LIBRARY_PATH or equivalent.
                             " >&5
 echo "$as_me: error:
-Please check that gtk-config is in path, the directory
-where GTK+ libraries are installed (returned by
-'gtk-config --libs' command) is in LD_LIBRARY_PATH or
-equivalent variable and GTK+ is version 1.2.3 or above.
+The development files for GTK+ were not found. For GTK+ 2, please
+ensure that pkg-config is in the path and that gtk+-2.0.pc is
+installed. For GTK+ 1.2 please check that gtk-config is in the path,
+and that the version is 1.2.3 or above. Also check that the
+libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config
+--libs' are in the LD_LIBRARY_PATH or equivalent.
                             " >&2;}
    { (exit 1); exit 1; }; }
                     ;;

diff --git a/configure.in b/configure.in
index 8858b84cfa7a66836d5e77e5a5da6cce483bb23b..1e23f1919471c3ec18c9a2076eb2acb58b88f949 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -567,6 +567,9 @@ if test $DEBUG_CONFIGURE = 1; then
   DEFAULT_wxUSE_MONOLITHIC=no
   DEFAULT_wxUSE_PLUGINS=no
   DEFAULT_wxUSE_OFFICIAL_BUILD=no
+
+  DEFAULT_wxUSE_GTK1=no
+  DEFAULT_wxUSE_GTK2=no
 else
   DEFAULT_wxUSE_UNIVERSAL=no
   DEFAULT_wxUSE_STL=no
@@ -765,8 +768,9 @@ else
   DEFAULT_wxUSE_PLUGINS=no
   DEFAULT_wxUSE_OFFICIAL_BUILD=no
 
-  dnl Appliable only when --with-gtk was used:
-  DEFAULT_wxUSE_GTK2=yes
+  dnl Implies --with-gtk. Should be no here, the default is set to yes below
+  DEFAULT_wxUSE_GTK1=no
+  DEFAULT_wxUSE_GTK2=no
 fi
 
 dnl WX_ARG_WITH should be used to select whether an external package will be
@@ -803,7 +807,9 @@ WX_ARG_ENABLE(plugins,     [  --enable-plugins        build parts of wxWidgets a
 if test "$wxUSE_GUI" = "yes"; then
 
 WX_ARG_ENABLE(universal,   [  --enable-universal      use wxWidgets GUI controls instead of native ones], wxUSE_UNIVERSAL)
-AC_ARG_WITH(gtk,           [  --with-gtk              use GTK+], [wxUSE_GTK="$withval" CACHE_GTK=1 TOOLKIT_GIVEN=1])
+AC_ARG_WITH(gtk,           [  --with-gtk              use GTK+ (currently uses 2.0)], [wxUSE_GTK="$withval" CACHE_GTK=1 TOOLKIT_GIVEN=1])
+WX_ARG_WITH(gtk1,          [  --with-gtk1             use GTK+ 1.2], wxUSE_GTK1)
+WX_ARG_WITH(gtk2,          [  --with-gtk2             use GTK+ 2.0], wxUSE_GTK2)
 AC_ARG_WITH(motif,         [  --with-motif            use Motif/Lesstif], [wxUSE_MOTIF="$withval" CACHE_MOTIF=1 TOOLKIT_GIVEN=1])
 AC_ARG_WITH(mac,           [  --with-mac              use Mac OS X], [wxUSE_MAC="$withval" CACHE_MAC=1 TOOLKIT_GIVEN=1])
 AC_ARG_WITH(cocoa,         [  --with-cocoa            use Cocoa], [wxUSE_COCOA="$withval" CACHE_COCOA=1 TOOLKIT_GIVEN=1])
@@ -815,7 +821,6 @@ AC_ARG_WITH(microwin,      [  --with-microwin         use MicroWindows], [wxUSE_
 AC_ARG_WITH(x11,           [  --with-x11              use X11], [wxUSE_X11="$withval" wxUSE_UNIVERSAL="yes" CACHE_X11=1 TOOLKIT_GIVEN=1])
 WX_ARG_ENABLE(nanox,       [  --enable-nanox          use NanoX], wxUSE_NANOX)
 
-WX_ARG_ENABLE(gtk2,        [  --disable-gtk2          use GTK+ 1.2 instead of 2.0], wxUSE_GTK2)
 WX_ARG_ENABLE(gpe,         [  --enable-gpe            use GNOME PDA Environment features if possible], wxUSE_GPE)
 
 WX_ARG_SYS_WITH(libpng,    [  --with-libpng           use libpng (PNG image format)], wxUSE_LIBPNG)
@@ -1213,6 +1218,12 @@ if test "$wxUSE_WINE" = "yes"; then
     wxUSE_SHARED=no
 fi
 
+dnl --with-gtk1 or --with-gtk2 imply --with-gtk
+if test "$wxUSE_GTK1" = "yes" -o "$wxUSE_GTK2" = "yes"; then
+    wxUSE_GTK=yes
+    TOOLKIT_GIVEN=1
+fi
+
 if test "$wxUSE_GUI" = "yes"; then
 
     if test "$USE_BEOS" = 1; then
@@ -2580,12 +2591,19 @@ if test "$wxUSE_GUI" = "yes"; then
                     GTK_MODULES=gthread
                 fi
 
-                dnl note that if we fail to find GTK2 we abort and don't fall
-                dnl back to GTK1.x
+                dnl GTK+2 is currently the default
+                if test "x$wxUSE_GTK1" != "xyes" -a "x$wxUSE_GTK2" != "xyes"; then
+                    wxUSE_GTK2=yes
+                fi
+
+                dnl test for GTK2
                 wx_cv_lib_gtk=
                 if test "x$wxUSE_GTK2" = "xyes"; then
                     AM_PATH_GTK_2_0(2.0.0, wx_cv_lib_gtk=2.0, , $GTK_MODULES)
-                else
+                fi
+
+                dnl test for GTK1.x
+                if test -z "$wx_cv_lib_gtk" -a "x$wxUSE_GTK1" = "xyes"; then
                     AM_PATH_GTK(1.2.7, wx_cv_lib_gtk=1.2.7, , $GTK_MODULES)
 
                     if test -z "$wx_cv_lib_gtk"; then
@@ -2621,10 +2639,12 @@ if test "$wxUSE_GUI" = "yes"; then
             1.2.3)  WXGTK12=1
                     ;;
             *)      AC_MSG_ERROR([
-Please check that gtk-config is in path, the directory
-where GTK+ libraries are installed (returned by
-'gtk-config --libs' command) is in LD_LIBRARY_PATH or
-equivalent variable and GTK+ is version 1.2.3 or above.
+The development files for GTK+ were not found. For GTK+ 2, please
+ensure that pkg-config is in the path and that gtk+-2.0.pc is
+installed. For GTK+ 1.2 please check that gtk-config is in the path,
+and that the version is 1.2.3 or above. Also check that the
+libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config
+--libs' are in the LD_LIBRARY_PATH or equivalent.
                             ])
                     ;;
         esac