remove --enable-gtk3 configure flag
authorPaul <paul@claws-mail.org>
Wed, 7 Nov 2018 11:07:17 +0000 (11:07 +0000)
committerPaul <paul@claws-mail.org>
Wed, 7 Nov 2018 11:07:17 +0000 (11:07 +0000)
configure.ac
src/gtk/Makefile.am

index a5f1bc9..226ea17 100644 (file)
@@ -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])
 
                [  --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])
 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
 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"], [])
 AC_ARG_ENABLE(deprecated,
                [  --disable-deprecated            Disable deprecated GTK functions],
                [GTK_CFLAGS="$GTK_CFLAGS -DG_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED"], [])
index 633ce8a..0cbd8ae 100644 (file)
@@ -11,11 +11,6 @@ noinst_LTLIBRARIES = libclawsgtk.la
 EXTRA_DIST = \
        claws-marshal.list
 
 EXTRA_DIST = \
        claws-marshal.list
 
-if GTK2
-gtk2_sources = \
-       gtkcmoptionmenu.c
-endif
-
 if OS_WIN32
 arch_sources = w32_filesel.c
 else
 if OS_WIN32
 arch_sources = w32_filesel.c
 else
@@ -33,9 +28,9 @@ libclawsgtk_la_SOURCES = \
        gtkaspell.c \
        gtkcmctree.c \
        gtkcmclist.c \
        gtkaspell.c \
        gtkcmctree.c \
        gtkcmclist.c \
+       gtkcmoptionmenu.c \
        gtksctree.c \
        gtkunit.c \
        gtksctree.c \
        gtkunit.c \
-       $(gtk2_sources) \
        gtkshruler.c \
        gtkutils.c \
        gtkvscrollbutton.c \
        gtkshruler.c \
        gtkutils.c \
        gtkvscrollbutton.c \