2008-10-18 Jim Evins <evins@snaught.com>

[glabels] / glabels2 / configure.in

diff --git a/glabels2/configure.in b/glabels2/configure.in
index cd042c30fd1c98aca430177b6feaaf198249a3e7..8659fb053eb9257fb3093ffd3ef9f69dd6417cb1 100644 (file)
--- a/glabels2/configure.in
+++ b/glabels2/configure.in
@@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.52)
 
-AC_INIT(glabels, 2.pre2svn, http://sourceforge.net/tracker/?func=add&group_id=46122&atid=445116)
+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)
 
@@ -21,6 +21,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)
 
@@ -40,7 +41,7 @@ dnl 5. If any interfaces have been added since the last public release, then inc
 dnl 6. If any interfaces have been removed since the last public release, then set age
 dnl    to 0.
 LIBGLABELS_C=5
-LIBGLABELS_R=0
+LIBGLABELS_R=1
 LIBGLABELS_A=0
 
 LIBGLABELS_VERSION_INFO=${LIBGLABELS_C}:${LIBGLABELS_R}:${LIBGLABELS_A}
@@ -55,7 +56,6 @@ 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
 
 dnl Make above strings available for packaging files (e.g. rpm spec files)
@@ -64,7 +64,6 @@ AC_SUBST(GTK_REQUIRED)
 AC_SUBST(LIBGNOME_REQUIRED)
 AC_SUBST(LIBGNOMEUI_REQUIRED)
 AC_SUBST(LIBXML_REQUIRED)
-AC_SUBST(LIBGLADE_REQUIRED)
 AC_SUBST(LIBEBOOK_REQUIRED)
 
 
@@ -95,7 +94,6 @@ 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 \
 )
 
@@ -130,7 +128,7 @@ if test "x$enable_deprecations" = "xyes"; then
 -DGTK_DISABLE_DEPRECATED \
 -DGDK_PIXBUF_DISABLE_DEPRECATED \
 -DGNOME_DISABLE_DEPRECATED \
--DLIBGLADE_DISABLE_DEPRECATED"
+"
    AC_SUBST(DISABLE_DEPRECATED_CFLAGS)
 fi
 
@@ -163,7 +161,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"
+ALL_LINGUAS="fr de ja pt_BR es ru zh_TW.Big5 pl cs it eo ko"
 AM_GLIB_GNU_GETTEXT
 
 
@@ -179,12 +177,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