2009-05-19 Jim Evins <evins@snaught.com>

[glabels] / glabels2 / configure.in

diff --git a/glabels2/configure.in b/glabels2/configure.in
index d4f9e34e4fba012bf4acb096ca0e88da6fe81c63..595e6f502afd1a48ed993591d7ccbf486ebaa237 100644 (file)
--- a/glabels2/configure.in
+++ b/glabels2/configure.in
@@ -5,11 +5,13 @@ AC_PREREQ(2.52)
 AC_INIT(glabels, 2.3.pre0svn, http://sourceforge.net/tracker/?func=add&group_id=46122&atid=445116)
 AC_CONFIG_SRCDIR(src/glabels.c)
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
+GNOME_DOC_INIT
 
 AM_MAINTAINER_MODE
 AM_CONFIG_HEADER(config.h)
 
 AC_PROG_INTLTOOL([0.21])
+PKG_PROG_PKG_CONFIG
 
 AM_PROG_LIBTOOL
 
@@ -21,6 +23,7 @@ AC_HEADER_STDC
 GNOME_COMPILE_WARNINGS
 
 AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
+AC_PATH_PROG(GTK_BUILDER_CONVERT, gtk-builder-convert)
 
 GTK_DOC_CHECK(1.0)
 
@@ -50,21 +53,15 @@ AC_SUBST(LIBGLABELS_VERSION_INFO)
 dnl ---------------------------------------------------------------------------
 dnl - Library dependencies
 dnl ---------------------------------------------------------------------------
-GLIB_REQUIRED=2.12.0
-GTK_REQUIRED=2.10.0
-LIBGNOME_REQUIRED=2.16.0
-LIBGNOMEUI_REQUIRED=2.16.0
-LIBXML_REQUIRED=2.6.0
-LIBGLADE_REQUIRED=2.6.0
-LIBEBOOK_REQUIRED=1.8.0
+GLIB_REQUIRED=2.18.0
+GTK_REQUIRED=2.14.0
+LIBXML_REQUIRED=2.7.0
+LIBEBOOK_REQUIRED=2.24.0
 
 dnl Make above strings available for packaging files (e.g. rpm spec files)
 AC_SUBST(GLIB_REQUIRED)
 AC_SUBST(GTK_REQUIRED)
-AC_SUBST(LIBGNOME_REQUIRED)
-AC_SUBST(LIBGNOMEUI_REQUIRED)
 AC_SUBST(LIBXML_REQUIRED)
-AC_SUBST(LIBGLADE_REQUIRED)
 AC_SUBST(LIBEBOOK_REQUIRED)
 
 
@@ -92,10 +89,7 @@ dnl ---------------------------------------------------------------------------
 PKG_CHECK_MODULES(GLABELS, \
 glib-2.0 >= $GLIB_REQUIRED \
 gtk+-2.0 >= $GTK_REQUIRED \
-libgnome-2.0 >= $LIBGNOME_REQUIRED \
-libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED \
 libxml-2.0 >= $LIBXML_REQUIRED \
-libglade-2.0 >= $LIBGLADE_REQUIRED \
 $OPTIONAL_MODULES \
 )
 
@@ -129,8 +123,7 @@ if test "x$enable_deprecations" = "xyes"; then
 -DGDK_DISABLE_DEPRECATED \
 -DGTK_DISABLE_DEPRECATED \
 -DGDK_PIXBUF_DISABLE_DEPRECATED \
--DGNOME_DISABLE_DEPRECATED \
--DLIBGLADE_DISABLE_DEPRECATED"
+"
    AC_SUBST(DISABLE_DEPRECATED_CFLAGS)
 fi
 
@@ -163,7 +156,7 @@ AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Gettext package])
 
 dnl Add the languages here.
-ALL_LINGUAS="fr de ja pt_BR es ru zh_TW.Big5 pl cs it eo ko"
+ALL_LINGUAS="fr de ja pt_BR es ru zh_TW.Big5 pl cs it eo ko ca zh_CN"
 AM_GLIB_GNU_GETTEXT
 
 
@@ -179,12 +172,11 @@ libglabels/libglabels.pc
 src/Makefile
 src/pixmaps/Makefile
 src/stock-pixmaps/Makefile
-src/mygal/Makefile
 data/Makefile
 data/templates/Makefile
 data/pixmaps/Makefile
 data/mime/Makefile
-data/glade/Makefile
+data/builder/Makefile
 data/desktop/Makefile
 data/dtd/Makefile
 data/man/Makefile