commit e6df99dfbc3e0c08b1d2a62aa8511cc981fca28f
parent 4d8b3527479afa351d2752a1e654efd1ff5d2f14
Author: Paul <paul@claws-mail.org>
Date: Wed, 7 Nov 2018 11:07:17 +0000
remove --enable-gtk3 configure flag
Diffstat:
2 files changed, 2 insertions(+), 19 deletions(-)
diff --git a/configure.ac b/configure.ac
@@ -296,10 +296,6 @@ AC_ARG_ENABLE(alternate-addressbook,
[ --enable-alternate-addressbook Build alternate external address book support],
[enable_alternate_addressbook=$enableval], [enable_alternate_addressbook=no])
-AC_ARG_ENABLE(gtk3,
- [ --enable-gtk3 Build GTK3 support],
- [enable_gtk3=$enableval], [enable_gtk3=no])
-
AC_ARG_ENABLE(svg,
[ --disable-svg Do not build SVG support],
[enable_svg=$enableval], [enable_svg=yes])
@@ -568,15 +564,7 @@ dnl ** GTK user interface **
dnl ************************
dnl Checks for GTK
-AM_CONDITIONAL(GTK3, false)
-AM_CONDITIONAL(GTK2, true)
-if test x"$enable_gtk3" = x"yes"; then
- PKG_CHECK_MODULES(GTK, gtk+-3.0 >= 3.0 cairo)
- AM_CONDITIONAL(GTK3, true)
- AM_CONDITIONAL(GTK2, false)
-else
- PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.24)
-fi
+PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.24)
AC_ARG_ENABLE(deprecated,
[ --disable-deprecated Disable deprecated GTK functions],
[GTK_CFLAGS="$GTK_CFLAGS -DG_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED"], [])
diff --git a/src/gtk/Makefile.am b/src/gtk/Makefile.am
@@ -11,11 +11,6 @@ noinst_LTLIBRARIES = libclawsgtk.la
EXTRA_DIST = \
claws-marshal.list
-if GTK2
-gtk2_sources = \
- gtkcmoptionmenu.c
-endif
-
if OS_WIN32
arch_sources = w32_filesel.c
else
@@ -33,9 +28,9 @@ libclawsgtk_la_SOURCES = \
gtkaspell.c \
gtkcmctree.c \
gtkcmclist.c \
+ gtkcmoptionmenu.c \
gtksctree.c \
gtkunit.c \
- $(gtk2_sources) \
gtkshruler.c \
gtkutils.c \
gtkvscrollbutton.c \
