Preparation for 3.0.1

[glabels] / configure.ac

diff --git a/configure.ac b/configure.ac
index 15173bb98cf3f4cf0265ceb6bbb5484cff82377d..1f05a038746485c25a106ac0a72a9d8fdc2961c6 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,8 +1,24 @@
 dnl Process this file with autoconf to produce a configure script.
 
-AC_PREREQ(2.63)
 
-AC_INIT([glabels],[2.3.0],[http://sourceforge.net/tracker/?func=add&group_id=46122&atid=445116])
+dnl ---------------------------------------------------------------------------
+dnl - GLABELS version
+dnl ---------------------------------------------------------------------------
+m4_define([glabels_major_version], [3])
+m4_define([glabels_minor_version], [0])
+m4_define([glabels_micro_version], [1])
+
+m4_define([glabels_version],
+          [glabels_major_version.glabels_minor_version.glabels_micro_version])
+
+dnl ---------------------------------------------------------------------------
+
+
+AC_PREREQ(2.64)
+AC_INIT([glabels],[glabels_version],
+       [http://bugzilla.gnome.org/enter_bug.cgi?product=glabels],
+       [glabels])
+
 AC_CONFIG_SRCDIR(src/glabels.c)
 
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
@@ -31,10 +47,9 @@ GNOME_COMPILE_WARNINGS
 
 AC_PATH_PROG(GLIB_GENMARSHAL,         glib-genmarshal)
 AC_PATH_PROG(GDK_PIXBUF_CSOURCE,      gdk-pixbuf-csource)
-AC_PATH_PROG(UPDATE_MIME_DATABASE,    update-mime-database)
-AC_PATH_PROG(UPDATE_DESKTOP_DATABASE, update-desktop-database)
 AC_PATH_PROG(GTK_UPDATE_ICON_CACHE,   gtk-update-icon-cache)
 
+
 dnl ---------------------------------------------------------------------------
 dnl - GLABELS branch
 dnl ---------------------------------------------------------------------------
@@ -68,7 +83,7 @@ dnl    increment current, and set revision to 0.
 dnl 5. If any interfaces have been added since the last public release, then increment age.
 dnl 6. If any interfaces have been removed since the last public release, then set age
 dnl    to 0.
-LIBGLABELS_C=7
+LIBGLABELS_C=8
 LIBGLABELS_R=0
 LIBGLABELS_A=0
 
@@ -101,12 +116,12 @@ dnl ---------------------------------------------------------------------------
 dnl - Library dependencies
 dnl ---------------------------------------------------------------------------
 dnl Required dependencies
-GLIB_REQUIRED=2.27.1
-GTK_REQUIRED=2.91.1
-LIBXML_REQUIRED=2.7.7
-LIBRSVG_REQUIRED=2.26.3
-CAIRO_REQUIRED=1.8.0
-PANGO_REQUIRED=1.28.0
+GLIB_REQUIRED=2.28.2
+GTK_REQUIRED=3.0.9
+LIBXML_REQUIRED=2.7.8
+LIBRSVG_REQUIRED=2.32.0
+CAIRO_REQUIRED=1.10.0
+PANGO_REQUIRED=1.28.1
 
 dnl Optional dependencies
 LIBEBOOK_REQUIRED=2.30.3
@@ -148,6 +163,7 @@ dnl - LIBGLABELS more modest prerequisites
 dnl ---------------------------------------------------------------------------
 PKG_CHECK_MODULES(LIBGLABELS, [\
        glib-2.0 >= $GLIB_REQUIRED \
+       gobject-2.0 >= $GLIB_REQUIRED \
        libxml-2.0 >= $LIBXML_REQUIRED \
 ])
 
@@ -162,6 +178,7 @@ PKG_CHECK_MODULES(LIBGLBARCODE, [\
        glib-2.0 >= $GLIB_REQUIRED \
        cairo >= $CAIRO_REQUIRED \
        pango >= $PANGO_REQUIRED \
+       pangocairo >= $PANGO_REQUIRED \
 ])
 
 AC_SUBST(LIBGLBARCODE_CFLAGS)
@@ -287,18 +304,6 @@ if test "x$enable_deprecations" = "xyes"; then
 fi
 
 
-dnl ---------------------------------------------------------------------------
-dnl - Disable updating of mime and desktop databases
-dnl ---------------------------------------------------------------------------
-AC_ARG_ENABLE(update-mimedb, AS_HELP_STRING([--disable-update-mimedb],[disable the update-mime-database after install [default=no]]),,
-              enable_update_mimedb=yes)
-AM_CONDITIONAL(ENABLE_UPDATE_MIMEDB, test x$enable_update_mimedb = xyes)
-
-AC_ARG_ENABLE(update-desktopdb, AS_HELP_STRING([--disable-update-desktopdb],[disable the update-desktop-database after install [default=no]]),,
-              enable_update_desktopdb=yes)
-AM_CONDITIONAL(ENABLE_UPDATE_DESKTOPDB, test x$enable_update_desktopdb = xyes)
-
-
 dnl ---------------------------------------------------------------------------
 dnl - i18n support
 dnl ---------------------------------------------------------------------------
@@ -373,7 +378,3 @@ Optional barcode backends:
 
 
 "
-
-
-cat ${srcdir}/MESSAGE-OF-DOOM
-