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

[glabels] / glabels2 / configure.in

diff --git a/glabels2/configure.in b/glabels2/configure.in
index ea6001662273ee9d52aaa31f49a7921848eed335..f6a13409acbe385294cdd41fdfc90099dd3e3781 100644 (file)
--- a/glabels2/configure.in
+++ b/glabels2/configure.in
@@ -2,27 +2,34 @@ dnl Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.52)
 
-AC_INIT(glabels, 2.1.3, 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)
 
 AM_MAINTAINER_MODE
-AM_CONFIG_HEADER(config.h)
+m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
+
+AC_CONFIG_HEADERS(config.h)
+
+IT_PROG_INTLTOOL([0.21])
 
-AC_PROG_INTLTOOL([0.21])
+PKG_PROG_PKG_CONFIG
 
-AM_PROG_LIBTOOL
+AC_PROG_LIBTOOL
+
+GNOME_DOC_INIT
+GTK_DOC_CHECK(1.0)
 
 AC_ISC_POSIX
 AC_PROG_CC
-AM_PROG_CC_STDC
-AC_HEADER_STDC
+AC_PROG_INSTALL
 
 GNOME_COMPILE_WARNINGS
 
-AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
+AC_PATH_PROG(GLIB_GENMARSHAL,    glib-genmarshal)
+AC_PATH_PROG(GDK_PIXBUF_CSOURCE, gdk-pixbuf-csource)
 
-GTK_DOC_CHECK(1.0)
 
 dnl ---------------------------------------------------------------------------
 dnl - LIBGLABELS API versioning
@@ -39,9 +46,9 @@ 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=3
-LIBGLABELS_R=0
-LIBGLABELS_A=1
+LIBGLABELS_C=5
+LIBGLABELS_R=1
+LIBGLABELS_A=0
 
 LIBGLABELS_VERSION_INFO=${LIBGLABELS_C}:${LIBGLABELS_R}:${LIBGLABELS_A}
 AC_SUBST(LIBGLABELS_VERSION_INFO)
@@ -50,27 +57,15 @@ AC_SUBST(LIBGLABELS_VERSION_INFO)
 dnl ---------------------------------------------------------------------------
 dnl - Library dependencies
 dnl ---------------------------------------------------------------------------
-GLIB_REQUIRED=2.6.0
-GTK_REQUIRED=2.6.0
-LIBGNOME_REQUIRED=2.10.0
-LIBGNOMEUI_REQUIRED=2.10.0
-LIBXML_REQUIRED=2.6.0
-LIBGNOMEPRINT_REQUIRED=2.10.0
-LIBGNOMEPRINTUI_REQUIRED=2.10.0
-LIBGNOMECANVAS_REQUIRED=2.10.0
-LIBGLADE_REQUIRED=2.5.0
-LIBEBOOK_REQUIRED=1.2.0
+GLIB_REQUIRED=2.20.0
+GTK_REQUIRED=2.16.0
+LIBXML_REQUIRED=2.7.0
+LIBEBOOK_REQUIRED=2.26.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(LIBGNOMEPRINT_REQUIRED)
-AC_SUBST(LIBGNOMEPRINTUI_REQUIRED)
-AC_SUBST(LIBGNOMECANVAS_REQUIRED)
-AC_SUBST(LIBGLADE_REQUIRED)
 AC_SUBST(LIBEBOOK_REQUIRED)
 
 
@@ -98,13 +93,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 \
-libgnomeprint-2.2 >= $LIBGNOMEPRINT_REQUIRED \
-libgnomeprintui-2.2 >= $LIBGNOMEPRINTUI_REQUIRED \
-libgnomecanvas-2.0 >= $LIBGNOMECANVAS_REQUIRED \
-libglade-2.0 >= $LIBGLADE_REQUIRED \
 $OPTIONAL_MODULES \
 )
 
@@ -138,7 +127,7 @@ if test "x$enable_deprecations" = "xyes"; then
 -DGDK_DISABLE_DEPRECATED \
 -DGTK_DISABLE_DEPRECATED \
 -DGDK_PIXBUF_DISABLE_DEPRECATED \
--DGNOME_DISABLE_DEPRECATED"
+"
    AC_SUBST(DISABLE_DEPRECATED_CFLAGS)
 fi
 
@@ -170,11 +159,17 @@ GETTEXT_PACKAGE=glabels
 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"
 AM_GLIB_GNU_GETTEXT
 
 
+dnl ---------------------------------------------------------------------------
+dnl - Misc.
+dnl ---------------------------------------------------------------------------
+
+dnl Setup for libqrencode compilation
+AC_DEFINE(__STATIC, static, [Static attribute, needed to compile libqrencode])
+
+
 dnl ---------------------------------------------------------------------------
 dnl - Makefiles, etc.
 dnl ---------------------------------------------------------------------------
@@ -182,23 +177,21 @@ AC_OUTPUT([
 Makefile
 barcode-0.98/Makefile
 iec16022-0.2.1/Makefile
+qrencode-3.1.0/Makefile
 libglabels/Makefile
 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
+templates/Makefile
 po/Makefile.in
 help/Makefile
-help/C/Makefile
 docs/Makefile
 docs/libglabels/Makefile
 glabels.spec