diff options
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 35 |
1 files changed, 27 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac index 7ceb13a..1ab7753 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ -AC_INIT([polkit-mate],[1.6.0],[http://www.mate-desktop.org/],[polkit-mate]) +AC_INIT([polkit-mate],[1.7.0],[http://www.mate-desktop.org/],[mate-polkit]) -AM_INIT_AUTOMAKE([1.9 foreign dist-bzip2 no-dist-gzip]) +AM_INIT_AUTOMAKE([1.9 foreign dist-xz no-dist-gzip]) AC_CONFIG_SRCDIR([src]) AC_CONFIG_HEADERS([config.h]) @@ -121,14 +121,32 @@ MATE_MAINTAINER_MODE_DEFINES # Check for required packages # *************************** -GTK_REQUIRED=2.17.1 -POLKIT_AGENT_REQUIRED=0.97 -POLKIT_GOBJECT_REQUIRED=0.97 - -PKG_CHECK_MODULES(GTK, gtk+-2.0 >= $GTK_REQUIRED) +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.17.1 + ;; + 3.0) GTK_API_VERSION=3.0 + GTK_REQUIRED=3.0.0 + ;; +esac + +PKG_CHECK_MODULES(GTK, gtk+-$GTK_API_VERSION >= $GTK_REQUIRED) AC_SUBST(GTK_CFLAGS) AC_SUBST(GTK_LIBS) +POLKIT_AGENT_REQUIRED=0.97 +POLKIT_GOBJECT_REQUIRED=0.97 + PKG_CHECK_MODULES(POLKIT_AGENT, polkit-agent-1 >= $POLKIT_AGENT_REQUIRED) AC_SUBST(POLKIT_AGENT_CFLAGS) AC_SUBST(POLKIT_AGENT_LIBS) @@ -210,8 +228,9 @@ echo " compiler: ${CC} cflags: ${CFLAGS} cppflags: ${CPPFLAGS} - introspection: ${enable_introspection} + Gtk+ version: ${GTK_API_VERSION} Maintainer mode: ${USE_MAINTAINER_MODE} Building api docs: ${enable_gtk_doc} + GObject Introspection: ${enable_introspection} " |