Cleanup of configure.in

More minor cleanup of configure.in.  My iec16022 patch was accepted upstream
and there was a new release -- update required version.  Added URLs to
configure.in to inform packagers where to obtain upstream libraries.  Updated
README to document these optional dependencies.

diff --git a/README b/README
index abbd9c92925982673d87c7ed05092fceaad6db2c..bd9a270c4b2a0f1fca8dd422c30c9be3a3763781 100644 (file)
--- a/README
+++ b/README
@@ -1,9 +1,9 @@
 Copyright
 =========
 
-   Copyright (C) 2001-2007 Jim Evins
+   Copyright (C) 2001-2009 Jim Evins
 
-   gLabels contains components copyrighted by others -- see th 'AUTHORS' file in
+   gLabels contains components copyrighted by others -- see the 'AUTHORS' file in
    this directory.
 
    For license information see the 'COPYING.README_FIRST' file in this directory.
@@ -28,6 +28,18 @@ LIBXML-2.7.x
 All of these libraries are available as part of Gnome 2.16
 
 
+Optional Merge Backends
+=======================
+Evolution Data Server 2.28.0+
+
+
+Optional Barcode Backends
+=========================
+GNU Barcode 0.98+ (http://www.gnu.org/software/barcode/barcode.html)
+QREncode 3.1.0+ (http://megaui.net/fukuchi/works/qrencode/index.en.html)
+IEC16022 0.2.4+ (http://datenfreihafen.org/projects/iec16022.html)
+
+
 
 Author and Acknowledgments:
 ===========================

diff --git a/configure.in b/configure.in
index 8ce37843ac1e624296c79d12c4499031461e30e3..86315131869da7c47c640f75cce95c4f6caed65f 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -57,11 +57,17 @@ AC_SUBST(LIBGLABELS_VERSION_INFO)
 dnl ---------------------------------------------------------------------------
 dnl - Library dependencies
 dnl ---------------------------------------------------------------------------
+dnl Required dependencies
 GLIB_REQUIRED=2.20.0
 GTK_REQUIRED=2.16.0
 GCONF_REQUIRED=2.26.0
 LIBXML_REQUIRED=2.7.0
+
+dnl Optional dependencies
 LIBEBOOK_REQUIRED=2.26.0
+LIBBARCODE_REQUIRED=0.98
+LIBQRENCODE_REQUIRED=3.1.0
+LIBIEC16022_REQUIRED=0.2.4
 
 dnl Make above strings available for packaging files (e.g. rpm spec files)
 AC_SUBST(GLIB_REQUIRED)
@@ -69,24 +75,9 @@ AC_SUBST(GTK_REQUIRED)
 AC_SUBST(GCONF_REQUIRED)
 AC_SUBST(LIBXML_REQUIRED)
 AC_SUBST(LIBEBOOK_REQUIRED)
-
-
-dnl ---------------------------------------------------------------------------
-dnl - Check for evolution data server
-dnl ---------------------------------------------------------------------------
-AC_ARG_WITH(libebook,
-           [AC_HELP_STRING([--without-libebook],
-                            [build without Evolution Data Server support])])
-have_libebook=no
-if test "x$with_libebook" != xno; then
-       PKG_CHECK_MODULES(LIBEBOOK, libebook-1.2 >= $LIBEBOOK_REQUIRED,
-                         [have_libebook=yes], [have_libebook=no])
-fi
-
-if test "x$have_libebook" = "xyes"; then
-       AC_DEFINE(HAVE_LIBEBOOK,1,[Define to 1 for EDS support])
-       OPTIONAL_MODULES="$OPTIONAL_MODULES libebook-1.2 >= $LIBEBOOK_REQUIRED"
-fi
+AC_SUBST(LIBBARCODE_REQUIRED)
+AC_SUBST(LIBQRENCODE_REQUIRED)
+AC_SUBST(LIBIEC16022_REQUIRED)
 
 
 dnl ---------------------------------------------------------------------------
@@ -97,7 +88,6 @@ glib-2.0 >= $GLIB_REQUIRED \
 gtk+-2.0 >= $GTK_REQUIRED \
 gconf-2.0 >= $GCONF_REQUIRED \
 libxml-2.0 >= $LIBXML_REQUIRED \
-$OPTIONAL_MODULES \
 )
 
 AC_SUBST(GLABELS_CFLAGS)
@@ -118,7 +108,26 @@ AC_SUBST(LIBGLABELS_LIBS)
 
 
 dnl ---------------------------------------------------------------------------
-dnl - Check for GNU Barcode backend
+dnl - Check for optional evolution data server
+dnl ---------------------------------------------------------------------------
+AC_ARG_WITH(libebook,
+           [AC_HELP_STRING([--without-libebook],
+                            [build without Evolution Data Server support])])
+have_libebook=no
+if test "x$with_libebook" != xno; then
+       PKG_CHECK_MODULES(LIBEBOOK, libebook-1.2 >= $LIBEBOOK_REQUIRED,
+                         [have_libebook=yes], [have_libebook=no])
+fi
+
+if test "x$have_libebook" = "xyes"; then
+       AC_DEFINE(HAVE_LIBEBOOK,1,[Define to 1 for EDS support])
+       AC_SUBST(LIBEBOOK_CFLAGS)
+       AC_SUBST(LIBEBOOK_LIBS)
+fi
+
+
+dnl ---------------------------------------------------------------------------
+dnl - Check for optional GNU Barcode backend
 dnl ---------------------------------------------------------------------------
 AC_ARG_WITH(libbarcode,
            [AC_HELP_STRING([--without-libbarcode],
@@ -135,25 +144,29 @@ if test "x$have_libbarcode" = "xyes"; then
        LIBBARCODE_LIBS="-lbarcode"
        AC_SUBST(LIBBARCODE_CFLAGS)
        AC_SUBST(LIBBARCODE_LIBS)
+else
+       help_libbarcode="(See http://www.gnu.org/software/barcode/barcode.html)"
 fi
 
 
 dnl ---------------------------------------------------------------------------
-dnl - Check for QRencode Barcode backend
+dnl - Check for optional QRencode Barcode backend
 dnl ---------------------------------------------------------------------------
 AC_ARG_WITH(libqrencode,
            [AC_HELP_STRING([--without-libqrencode],
-                            [build without QRencode support])])
+                            [build without QR code support])])
 have_libqrencode=no
 if test "x$with_libqrencode" != xno; then
-       PKG_CHECK_MODULES(LIBQRENCODE, libqrencode >= 3.1.0,
+       PKG_CHECK_MODULES(LIBQRENCODE, libqrencode >= $LIBQRENCODE_REQUIRED,
                          [have_libqrencode=yes], [have_libqrencode=no])
 fi
 
 if test "x$have_libqrencode" = "xyes"; then
-       AC_DEFINE(HAVE_LIBQRENCODE,1,[Define to 1 for QRencode support])
+       AC_DEFINE(HAVE_LIBQRENCODE,1,[Define to 1 for QR code support])
        AC_SUBST(LIBQRENCODE_CFLAGS)
        AC_SUBST(LIBQRENCODE_LIBS)
+else
+       help_libqrencode="(See http://megaui.net/fukuchi/works/qrencode/index.en.html)"
 fi
 
 
@@ -162,17 +175,19 @@ dnl - Check for IEC16022 Barcode backend
 dnl ---------------------------------------------------------------------------
 AC_ARG_WITH(libiec16022,
            [AC_HELP_STRING([--without-libiec16022],
-                            [build without Iec16022 support])])
+                            [build without IEC 16022 support])])
 have_libiec16022=no
 if test "x$with_libiec16022" != xno; then
-       PKG_CHECK_MODULES(LIBIEC16022, libiec16022 >= 0.2.3,
+       PKG_CHECK_MODULES(LIBIEC16022, libiec16022 >= $LIBIEC16022_REQUIRED,
                          [have_libiec16022=yes], [have_libiec16022=no])
 fi
 
 if test "x$have_libiec16022" = "xyes"; then
-       AC_DEFINE(HAVE_LIBIEC16022,1,[Define to 1 for IEC16022 support])
+       AC_DEFINE(HAVE_LIBIEC16022,1,[Define to 1 for IEC 16022 support])
        AC_SUBST(LIBIEC16022_CFLAGS)
        AC_SUBST(LIBIEC16022_LIBS)
+else
+       help_libiec16022="(See http://datenfreihafen.org/projects/iec16022.html)"
 fi
 
 
@@ -254,20 +269,29 @@ dnl ---------------------------------------------------------------------------
 dnl - Print configuration information
 dnl ---------------------------------------------------------------------------
 echo "
+
 Configuration:
 
-        Package ........................ : ${PACKAGE}-${VERSION}
-        Installation prefix ............ : ${prefix}
-        Source code location ........... : ${srcdir}
-        Compiler ....................... : ${CC} 
+        Package ................. ${PACKAGE}-${VERSION}
+        Installation prefix ..... ${prefix}
+        Source code location .... ${srcdir}
+        Compiler ................ ${CC} 
+
 
-        Evolution Data Server support .. : ${have_libebook}
+Optional data merge backends:
+
+        Evolution Data Server ... ${have_libebook}
+
+
+Optional barcode backends:
+
+        GNU Barcode ............. ${have_libbarcode} ${help_libbarcode}
+        QR Code ................. ${have_libqrencode} ${help_libqrencode}
+        IEC 16022 ............... ${have_libiec16022} ${help_libiec16022}
 
-        GNU Barcode support ............ : ${have_libbarcode}
-        QR code Barcode support ........ : ${have_libqrencode}
-        IEC16022 Barcode support ....... : ${have_libiec16022}
 
 "
 
+
 cat ${srcdir}/MESSAGE-OF-DOOM
 

diff --git a/src/Makefile.am b/src/Makefile.am
index 720da519fbf9bef5dfc6fcc56d04f09155397127..2c312744dcc0a8024425959470bbfce0686f305b 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -7,6 +7,7 @@ INCLUDES = \
        -I$(top_srcdir)                                         \
        -I$(top_builddir)                                       \
        $(GLABELS_CFLAGS)                                       \
+       $(LIBEBOOK_CFLAGS)                                      \
        $(LIBBARCODE_CFLAGS)                                    \
        $(LIBQRENCODE_CFLAGS)                                   \
        $(LIBIEC16022_CFLAGS)                                   \
@@ -26,6 +27,7 @@ glabels_LDFLAGS = -export-dynamic
 glabels_LDADD =                                \
        $(GLABELS_LIBS)                         \
        ../libglabels/libglabels.la             \
+       $(LIBEBOOK_LIBS)                        \
        $(LIBBARCODE_LIBS)                      \
        $(LIBQRENCODE_LIBS)                     \
        $(LIBIEC16022_LIBS)
@@ -35,6 +37,7 @@ glabels_batch_LDFLAGS = -export-dynamic
 glabels_batch_LDADD =                          \
        $(GLABELS_LIBS)                         \
        ../libglabels/libglabels.la             \
+       $(LIBEBOOK_LIBS)                        \
        $(LIBBARCODE_LIBS)                      \
        $(LIBQRENCODE_LIBS)                     \
        $(LIBIEC16022_LIBS)