Workaround for pango kerning bug.

[glabels] / configure.ac

diff --git a/configure.ac b/configure.ac
index 973bcd75b807dca45cecd969f28ce801a7677227..4af43da88dfa6495f59e7cbd264ed1caae437567 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)
@@ -18,9 +34,11 @@ PKG_PROG_PKG_CONFIG
 
 LT_INIT
 
-GNOME_DOC_INIT
+YELP_HELP_INIT
 GTK_DOC_CHECK(1.0)
 
+GLIB_GSETTINGS
+
 AC_SEARCH_LIBS([strerror],[cposix])
 AC_PROG_CC
 AC_PROG_INSTALL
@@ -28,10 +46,10 @@ AC_PROG_INSTALL
 GNOME_COMPILE_WARNINGS
 
 AC_PATH_PROG(GLIB_GENMARSHAL,         glib-genmarshal)
-AC_PATH_PROG(UPDATE_MIME_DATABASE,    update-mime-database)
-AC_PATH_PROG(UPDATE_DESKTOP_DATABASE, update-desktop-database)
+AC_PATH_PROG(GDK_PIXBUF_CSOURCE,      gdk-pixbuf-csource)
 AC_PATH_PROG(GTK_UPDATE_ICON_CACHE,   gtk-update-icon-cache)
 
+
 dnl ---------------------------------------------------------------------------
 dnl - GLABELS branch
 dnl ---------------------------------------------------------------------------
@@ -65,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
 
@@ -98,16 +116,15 @@ dnl ---------------------------------------------------------------------------
 dnl - Library dependencies
 dnl ---------------------------------------------------------------------------
 dnl Required dependencies
-GLIB_REQUIRED=2.24.0
-GTK_REQUIRED=2.20.0
-GCONF_REQUIRED=2.28.0
-LIBXML_REQUIRED=2.7.0
-LIBRSVG_REQUIRED=2.26.0
-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.28.0
+LIBEBOOK_REQUIRED=2.30.3
 LIBBARCODE_REQUIRED=0.98
 LIBQRENCODE_REQUIRED=3.1.0
 LIBIEC16022_REQUIRED=0.2.4
@@ -116,7 +133,6 @@ LIBZINT_REQUIRED=2.4.0
 dnl Make above strings available for packaging files (e.g. rpm spec files)
 AC_SUBST(GLIB_REQUIRED)
 AC_SUBST(GTK_REQUIRED)
-AC_SUBST(GCONF_REQUIRED)
 AC_SUBST(LIBXML_REQUIRED)
 AC_SUBST(LIBRSVG_REQUIRED)
 AC_SUBST(CAIRO_REQUIRED)
@@ -133,10 +149,9 @@ dnl - GLABELS prerequisites
 dnl ---------------------------------------------------------------------------
 PKG_CHECK_MODULES(GLABELS, [\
        glib-2.0 >= $GLIB_REQUIRED \
-       gtk+-2.0 >= $GTK_REQUIRED \
-       gconf-2.0 >= $GCONF_REQUIRED \
+       gtk+-3.0 >= $GTK_REQUIRED \
        libxml-2.0 >= $LIBXML_REQUIRED \
-       librsvg-2.0 > $LIBRSVG_REQUIRED \
+       librsvg-2.0 >= $LIBRSVG_REQUIRED \
 ])
 
 AC_SUBST(GLABELS_CFLAGS)
@@ -148,7 +163,7 @@ dnl - LIBGLABELS more modest prerequisites
 dnl ---------------------------------------------------------------------------
 PKG_CHECK_MODULES(LIBGLABELS, [\
        glib-2.0 >= $GLIB_REQUIRED \
-       gconf-2.0 >= $GCONF_REQUIRED \
+       gobject-2.0 >= $GLIB_REQUIRED \
        libxml-2.0 >= $LIBXML_REQUIRED \
 ])
 
@@ -163,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)
@@ -288,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 ---------------------------------------------------------------------------
@@ -320,6 +324,7 @@ libglabels/${LIBGLABELS_BRANCH}.pc
 libglbarcode/Makefile
 libglbarcode/${LIBGLBARCODE_BRANCH}.pc
 src/Makefile
+src/cursors/Makefile
 src/pixmaps/Makefile
 data/Makefile
 data/desktop/Makefile
@@ -332,6 +337,8 @@ data/icons/48x48/Makefile
 data/man/Makefile
 data/mime/Makefile
 data/pixmaps/Makefile
+data/schemas/Makefile
+data/schemas/org.gnome.glabels-3.gschema.xml.in
 data/ui/Makefile
 templates/Makefile
 po/Makefile.in
@@ -371,7 +378,3 @@ Optional barcode backends:
 
 
 "
-
-
-cat ${srcdir}/MESSAGE-OF-DOOM
-