diff options
| author | monsta <[email protected]> | 2016-11-06 14:43:26 +0300 |
|---|---|---|
| committer | monsta <[email protected]> | 2016-11-06 14:43:26 +0300 |
| commit | 4c06cb5cd0859067769dac1317682d430b18cc78 (patch) | |
| tree | 0c363ee71311366fb2016df9858858ef5ef2d25d /configure.ac | |
| parent | 65371f53dbb06180b750dad7c19e7bcf0f8651d6 (diff) | |
| download | pluma-4c06cb5cd0859067769dac1317682d430b18cc78.tar.bz2 pluma-4c06cb5cd0859067769dac1317682d430b18cc78.tar.xz | |
move to GTK+3 (>= 3.14), drop GTK+2 code and --with-gtk build option
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 32 |
1 files changed, 5 insertions, 27 deletions
diff --git a/configure.ac b/configure.ac index 112fdd3c..4fd1c5f4 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ dnl Process this file with autoconf to produce a configure script. AC_PREREQ(2.63.2) m4_define(pluma_major_version, 1) -m4_define(pluma_minor_version, 16) +m4_define(pluma_minor_version, 17) m4_define(pluma_micro_version, 0) m4_define(pluma_version, pluma_major_version.pluma_minor_version.pluma_micro_version) @@ -149,29 +149,8 @@ fi AM_CONDITIONAL(ENABLE_ENCHANT, test x"$enable_enchant" = "xyes") -dnl ================================================================ -dnl Start of pkg-config checks -dnl ================================================================ - -AC_MSG_CHECKING([which gtk+ version to compile against]) -AC_ARG_WITH([gtk], - [AS_HELP_STRING([--with-gtk=2.0|3.0],[which gtk+ version to compile against (default: 2.0)])], - [case "$with_gtk" in - 2.0|3.0) ;; - *) AC_MSG_ERROR([invalid gtk version specified]) ;; - esac], - [with_gtk=2.0]) -AC_MSG_RESULT([$with_gtk]) - -case "$with_gtk" in - 2.0) GTK_API_VERSION=2.0 - GTK_REQUIRED=2.24.0 - ;; - 3.0) GTK_API_VERSION=3.0 - GTK_REQUIRED=3.0.0 - ;; -esac -AC_SUBST(GTK_API_VERSION) +GTK_REQUIRED=3.14.0 +GTKSOURCEVIEW_REQUIRED=3.0.0 PKG_CHECK_MODULES(GMODULE,gmodule-2.0,[GMODULE_ADD="gmodule-2.0"],[GMODULE_ADD=""]) PKG_CHECK_MODULES(PLUMA, [ @@ -180,8 +159,8 @@ PKG_CHECK_MODULES(PLUMA, [ $GMODULE_ADD gthread-2.0 >= 2.13.0 gio-2.0 >= 2.26.0 - gtk+-$GTK_API_VERSION >= $GTK_REQUIRED - gtksourceview-$GTK_API_VERSION >= 2.9.7 + gtk+-3.0 >= $GTK_REQUIRED + gtksourceview-3.0 >= $GTKSOURCEVIEW_REQUIRED ]) PKG_CHECK_MODULES(X11, [x11]) @@ -288,7 +267,6 @@ Configuration: Source code location: ${srcdir} Compiler: ${CC} - GTK API version: $GTK_API_VERSION Spell Plugin enabled: $enable_enchant Gvfs metadata enabled: $enable_gvfs_metadata Tests enabled: $enable_tests |