ui: Fix for GTK+ 3.8 deprecations

[platform/upstream/gcr.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 54a051e..3db7b52 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.63])
-AC_INIT([gcr], [3.3.4],
+AC_INIT([gcr], [3.8.1],
         [http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-keyring&component=gcr],
         [gcr])
 
@@ -37,7 +37,7 @@ dnl ****************************************************************************
 AC_CONFIG_MACRO_DIR([build/m4])
 AM_INIT_AUTOMAKE([1.11 tar-ustar foreign -Wno-portability])
 AM_SANITY_CHECK
-AM_CONFIG_HEADER(config.h)
+AC_CONFIG_HEADERS(config.h)
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 AM_MAINTAINER_MODE([enable])
 
@@ -66,7 +66,7 @@ AM_GLIB_GNU_GETTEXT
 # GLib and GTK+ stuff
 
 PKG_CHECK_MODULES(GLIB,
-       glib-2.0 >= 2.30.0
+       glib-2.0 >= 2.32.0
        gmodule-no-export-2.0
        gthread-2.0
        gobject-2.0
@@ -75,15 +75,32 @@ AC_SUBST(GLIB_CFLAGS)
 AC_SUBST(GLIB_LIBS)
 
 GLIB_GSETTINGS
-GOBJECT_INTROSPECTION_CHECK([1.29])
+GOBJECT_INTROSPECTION_CHECK([1.34])
 AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
 AC_PATH_PROG(GLIB_MKENUMS, glib-mkenums)
 
 GTK_DOC_CHECK(1.9)
 
-PKG_CHECK_MODULES(GTK, gtk+-3.0 >= 3.0)
-AC_SUBST(GTK_CFLAGS)
-AC_SUBST(GTK_LIBS)
+# --------------------------------------------------------------------
+# Optional GTK+ widgets build, avoid building gtk-doc wihtout GTK+
+#
+AC_ARG_WITH(gtk, [
+            AC_HELP_STRING([--without-gtk],
+            [do not build code that uses GTK+]),
+            ], [], [with_gtk=yes])
+AM_CONDITIONAL(WITH_GTK, test "$with_gtk" != "no")
+
+if test "x$with_gtk" != "xno"; then
+       PKG_CHECK_MODULES(GTK, gtk+-3.0 >= 3.0)
+       AC_SUBST(GTK_CFLAGS)
+       AC_SUBST(GTK_LIBS)
+fi
+
+if test "x$enable_gtk_doc" = "xyes"; then
+  if test "x$with_gtk" = "xno"; then
+    AC_MSG_ERROR([Cannot build documentation if building GTK+ widgets is disabled])
+  fi
+fi
 
 # --------------------------------------------------------------------
 # Checks for functions
@@ -170,6 +187,11 @@ AC_ARG_ENABLE(update-mime,
        [don't run update-mime-database utility (useful for packages) ]))
 AM_CONDITIONAL(WITH_UPDATE_MIME, test "$enable_update_mime" != "no")
 
+AC_ARG_ENABLE(update-icon-cache,
+       AC_HELP_STRING([--disable-update-icon-cache],
+       [don't run gtk-update-icon-cache utility (useful for packages) ]))
+AM_CONDITIONAL(WITH_UPDATE_ICON_CACHE, test "$enable_update_icon_cache" != "no")
+
 # ----------------------------------------------------------------------
 # DBus services
 
@@ -271,15 +293,10 @@ AC_MSG_RESULT($strict_status)
 AC_SUBST(INTROSPECTION_FLAGS)
 AC_SUBST(TEST_MODE)
 
-AC_MSG_CHECKING([whether to build with gcov testing])
-AC_ARG_ENABLE([coverage],
-               AS_HELP_STRING([--enable-coverage],
-                       [Whether to enable coverage testing ]),
-               [],
-               [enable_coverage=no])
-
 AC_MSG_RESULT([$enable_coverage])
 
+AC_MSG_CHECKING([code coverage])
+
 if test "$enable_coverage" = "yes"; then
        if test "$GCC" != "yes"; then
                AC_MSG_ERROR(Coverage testing requires GCC)
@@ -290,24 +307,13 @@ if test "$enable_coverage" = "yes"; then
                AC_MSG_ERROR(gcov tool is not available)
        fi
 
-       AC_PATH_PROG(LCOV, lcov, no)
-       if test "$LCOV" = "no" ; then
-               AC_MSG_ERROR(lcov tool is not installed)
-       fi
-
-       AC_PATH_PROG(GENHTML, genhtml, no)
-       if test "$GENHTML" = "no" ; then
-               AC_MSG_ERROR(lcov's genhtml tool is not installed)
-       fi
-
-       CFLAGS="$CFLAGS -O0 -g -fprofile-arcs -ftest-coverage"
-       LDFLAGS="$LDFLAGS -lgcov"
+       CFLAGS="$CFLAGS -O0 -g --coverage"
+       LDFLAGS="$LDFLAGS --coverage"
 fi
 
 AM_CONDITIONAL([WITH_COVERAGE], [test "$enable_coverage" = "yes"])
-AC_SUBST(LCOV)
-AC_SUBST(GCOV)
-AC_SUBST(GENHTML)
+
+AC_MSG_RESULT($enable_coverage)
 
 AC_ARG_ENABLE(valgrind,
        AC_HELP_STRING([--enable-valgrind],
@@ -363,6 +369,7 @@ AC_SUBST(GCK_MAJOR)
 AC_SUBST(GCK_MINOR)
 
 GCR_LT_RELEASE=$GCR_CURRENT:$GCR_REVISION:$GCR_AGE
+AC_SUBST(GCR_CURRENT)
 AC_SUBST(GCR_LT_RELEASE)
 AC_SUBST(GCR_MAJOR)
 AC_SUBST(GCR_MINOR)
@@ -381,21 +388,23 @@ egg/tests/Makefile
 gck/gck.pc
 gck/Makefile
 gck/tests/Makefile
-gcr/gcr.pc
 gcr/gcr-base.pc
-gcr/gcr-viewer.desktop.in
 gcr/Makefile
-gcr/icons/Makefile
-gcr/icons/16x16/Makefile
-gcr/icons/22x22/Makefile
-gcr/icons/24x24/Makefile
-gcr/icons/32x32/Makefile
-gcr/icons/48x48/Makefile
-gcr/icons/256x256/Makefile
 gcr/tests/Makefile
 po/Makefile.in
 schema/Makefile
 testing/Makefile
+ui/gcr.pc
+ui/gcr-ui.pc
+ui/icons/Makefile
+ui/icons/16x16/Makefile
+ui/icons/22x22/Makefile
+ui/icons/24x24/Makefile
+ui/icons/32x32/Makefile
+ui/icons/48x48/Makefile
+ui/icons/256x256/Makefile
+ui/Makefile
+ui/tests/Makefile
 ])
 
 # ------------------------------------------------------------------------------
@@ -406,7 +415,8 @@ echo
 echo "BUILD"
 echo "  Debug Build:          $debug_status"
 echo "  Strict Compilation:   $strict_status"
+echo "  GTK+ Widgets:         $with_gtk"
 echo "  Introspection:        $found_introspection"
 echo "  Valgrind:             $valgrind_status"
-echo "  Test Coverage:        $enable_coverage"
+echo "  Test Coverage:        ${enable_coverage:-no}"
 echo