diff options
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 43 |
1 files changed, 31 insertions, 12 deletions
diff --git a/configure.ac b/configure.ac index 59c5c379..ebc62f6a 100644 --- a/configure.ac +++ b/configure.ac @@ -8,7 +8,7 @@ m4_define(pluma_micro_version, 0) m4_define(pluma_version, pluma_major_version.pluma_minor_version.pluma_micro_version) AC_INIT([pluma], [pluma_version], - [https://github.com/mate-desktop/mate-text-editor/issues], + [https://github.com/mate-desktop/pluma/issues], [pluma], [http://mate-desktop.org]) AC_CONFIG_HEADERS(config.h) @@ -22,7 +22,7 @@ AC_SUBST(PLUMA_MINOR_VERSION, pluma_minor_version) AC_DEFINE(PLUMA_MICRO_VERSION, pluma_micro_version, [Pluma micro version]) AC_SUBST(PLUMA_MICRO_VERSION, pluma_micro_version) -AM_INIT_AUTOMAKE([1.10 dist-bzip2 no-dist-gzip -Wno-portability]) +AM_INIT_AUTOMAKE([1.10 dist-xz no-dist-gzip -Wno-portability]) AM_MAINTAINER_MODE m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) @@ -268,15 +268,34 @@ 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.20.0 + ;; + 3.0) GTK_API_VERSION=3.0 + GTK_REQUIRED=3.0.0 + ;; +esac + PKG_CHECK_MODULES(GMODULE,gmodule-2.0,[GMODULE_ADD="gmodule-2.0"],[GMODULE_ADD=""]) PKG_CHECK_MODULES(PLUMA, [ libxml-2.0 >= 2.5.0 glib-2.0 >= 2.22.0 - $GMODULE_ADD + $GMODULE_ADD gthread-2.0 >= 2.13.0 gio-2.0 >= 2.26.0 - gtk+-2.0 >= 2.16.0 - gtksourceview-2.0 >= 2.9.7 + gtk+-$GTK_API_VERSION >= $GTK_REQUIRED + gtksourceview-$GTK_API_VERSION >= 2.9.7 ]) if test "$os_osx" = "no" && @@ -297,7 +316,7 @@ AC_SUBST(PLUMA_LIBS) dnl FIXME: Remove this when removing pluma-message-area -if $PKG_CONFIG --atleast-version 2.17.1 gtk+-2.0; then +if $PKG_CONFIG --atleast-version 2.17.1 gtk+-$GTK_API_VERSION; then gtkatleast= else gtkatleast=no @@ -307,7 +326,7 @@ AM_CONDITIONAL(BUILD_MESSAGE_AREA, test "$gtkatleast" = "no") dnl FIXME: Remove this when removing pluma-spinner -if $PKG_CONFIG --atleast-version 2.19.0 gtk+-2.0; then +if $PKG_CONFIG --atleast-version 2.19.0 gtk+-$GTK_API_VERSION; then gtkatleast= else gtkatleast=no @@ -370,9 +389,9 @@ if test "x$have_python" != "xno"; then PYTHON_EXTRA_LIBS= else PY_PREFIX=`$PYTHON -c 'import sys ; print sys.prefix'` - PYTHON_LIB_LOC="-L$PY_EXEC_PREFIX/lib/python$PYTHON_VERSION/config" + PYTHON_LIB_LOC="-L$libdir/python$PYTHON_VERSION/config" PYTHON_CFLAGS="-I$PY_PREFIX/include/python$PYTHON_VERSION" - PYTHON_MAKEFILE="$PY_EXEC_PREFIX/lib/python$PYTHON_VERSION/config/Makefile" + PYTHON_MAKEFILE="$libdir/python$PYTHON_VERSION/config/Makefile" PYTHON_BASEMODLIBS=`sed -n -e 's/^BASEMODLIBS=\(.*\)/\1/p' $PYTHON_MAKEFILE` PYTHON_OTHER_LIBS=`sed -n -e 's/^LIBS=\(.*\)/\1/p' $PYTHON_MAKEFILE` PYTHON_EXTRA_LIBS="$PYTHON_BASEMODLIBS $PYTHON_OTHER_LIBS" @@ -508,8 +527,7 @@ AC_SUBST(PLUMA_PLUGINS_DATA_DIR) PLUMA_PLUGINS_LIBS_DIR="$libdir/pluma/plugins" AC_SUBST(PLUMA_PLUGINS_LIBS_DIR) -MATE_DOC_INIT([0.9.0],, - [AC_MSG_WARN([[mate-doc-utils not found: documentation will not be built.]])]) +YELP_HELP_INIT AC_CONFIG_FILES([ Makefile @@ -566,6 +584,7 @@ Configuration: Source code location: ${srcdir} Compiler: ${CC} + GTK API version: $GTK_API_VERSION Python Plugins Support: $enable_python Spell Plugin enabled: $enable_enchant Gvfs metadata enabled: $enable_gvfs_metadata @@ -590,7 +609,7 @@ it from: Or checkout the mate-${stable_version} branch of the pluma module from: - git://github.com/mate-desktop/mate-text-editor.git + git://github.com/mate-desktop/pluma.git Thanks, The pluma team |