Skip to content

Commit a6e30bc

Browse files
committed
Using GTK+2 as default
GTK+3 is still not mature enough.
1 parent 205a701 commit a6e30bc

File tree

2 files changed

+9
-14
lines changed

2 files changed

+9
-14
lines changed

README.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ Or: `git clone http://www.geeqie.org/git/geeqie.git`
113113
List compile options: `./autogen.sh --help`
114114

115115
Common options:
116-
`./autogen.sh --disable-gtk3`,
116+
`./autogen.sh`,
117117

118118
Compilation: `./autogen.sh [options]; make -j<no. of cpu cores> `
119119

@@ -146,16 +146,16 @@ And either the ChangeLog file or [Geeqie ChangeLog](http://geeqie.org/cgi-bin/gi
146146
## Requirements
147147

148148
### Required libraries:
149-
GTK+ 3.00
150-
www.gtk.org
151-
enabled by default
152-
disable with configure option: --disable-gtk3
153-
or
154149
GTK+ 2.20
155-
disabled by default when GTK+3 libraries are found.
156-
enable with configure option: --disable-gtk3
150+
enabled by default even when GTK+3 libraries are found.
151+
disable with configure option: --enable-gtk3
157152
optional items map display and GPU acceleration are not available
158153
with GTK2
154+
or
155+
GTK+ 3.00
156+
www.gtk.org
157+
disabled by default when GTK+2 libraries are found.
158+
enable with configure option: --enable-gtk3
159159

160160
Note: GTK+3 is still somehow experimental. It is needed for some
161161
features but we have several complains about the GTK+3 usability.

configure.in

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -198,16 +198,11 @@ else
198198
fi
199199

200200
AM_PATH_GLIB_2_0(2.24.0,,AC_MSG_ERROR(GLIB >= 2.24.0 not installed.))
201-
AC_ARG_ENABLE([gtk3], AC_HELP_STRING([--disable-gtk3], [use gtk2 instead of gtk3]),[gtk3="${enableval}"], [gtk3=m4_ifdef([AM_PATH_GTK_3_0], [auto], [no])])
201+
AC_ARG_ENABLE([gtk3], AC_HELP_STRING([--enable-gtk3], [use gtk3 instead of gtk2]),[gtk3="${enableval}"], [gtk3=m4_ifdef([AM_PATH_GTK_3_0], m4_ifdef([AM_PATH_GTK_2_0], [no], [auto]), [no])])
202202

203203
if test x$gtk3 == xyes; then
204204
AC_MSG_WARN("Gtk3 enabled")
205205
m4_ifdef([AM_PATH_GTK_3_0], [AM_PATH_GTK_3_0(3.0.0,,AC_MSG_ERROR(GTK+ >= 3.0.0 not installed.))])
206-
else
207-
if test x$gtk3 != xno; then
208-
AC_MSG_WARN("Gtk3 is preferred...")
209-
m4_ifdef([AM_PATH_GTK_3_0], [AM_PATH_GTK_3_0(3.0.0,,[gtk3=no])])
210-
fi
211206
fi
212207

213208
if test x$gtk3 == xno; then

0 commit comments

Comments
 (0)