[glabels] Removed 3rd-party libraries
- From: Jim Evins <jimevins src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [glabels] Removed 3rd-party libraries
- Date: Thu, 8 Oct 2009 03:19:34 +0000 (UTC)
commit 67a64dea73deedfc465df50fd92442a460fa5f42
Author: Jim Evins <evins snaught com>
Date: Wed Oct 7 23:12:54 2009 -0400
Removed 3rd-party libraries
The 3rd-party libraries used as barcode backends are no longer redistributed
with gLabels. These libraries are now optional external dependencies, so if
one is not present it will not be used.
FIXME: the datamatrix IEC 16022 library is not installed by default by the
official iec16022 tarball.
AUTHORS | 39 +-
COPYING.README_FIRST | 15 -
Makefile.am | 1 -
bc-backends/Makefile.am | 7 -
bc-backends/barcode-0.98/COPYING | 339 -
bc-backends/barcode-0.98/ChangeLog | 460 -
bc-backends/barcode-0.98/INSTALL | 31 -
bc-backends/barcode-0.98/Makefile.am | 73 -
bc-backends/barcode-0.98/Makefile.in.dist | 141 -
bc-backends/barcode-0.98/README | 93 -
bc-backends/barcode-0.98/README.glabels | 7 -
bc-backends/barcode-0.98/TODO | 23 -
bc-backends/barcode-0.98/barcode.h | 119 -
bc-backends/barcode-0.98/barcode.spec | 84 -
bc-backends/barcode-0.98/bookland/bookland.py | 884 --
bc-backends/barcode-0.98/cmdline.c | 177 -
bc-backends/barcode-0.98/cmdline.h | 58 -
bc-backends/barcode-0.98/codabar.c | 182 -
bc-backends/barcode-0.98/code128.c | 607 -
bc-backends/barcode-0.98/code39.c | 173 -
bc-backends/barcode-0.98/code93.c | 213 -
bc-backends/barcode-0.98/compat/getopt.c | 831 --
bc-backends/barcode-0.98/compat/getopt.h | 129 -
bc-backends/barcode-0.98/configure | 5197 -------
bc-backends/barcode-0.98/configure.in.dist | 65 -
.../barcode-0.98/contrib/barcode-SVG.tar.gz | Bin 2880 -> 0 bytes
.../barcode-0.98/contrib/barcode-SVG.tar.gz.README | 24 -
.../barcode-0.98/contrib/barcode-for-delphi.tar.gz | Bin 19010 -> 0 bytes
.../contrib/barcode-for-delphi.tar.gz.README | 10 -
bc-backends/barcode-0.98/contrib/barcodeps-0.1.tgz | Bin 2036 -> 0 bytes
.../barcode-0.98/contrib/barcodeps-0.1.tgz.README | 25 -
bc-backends/barcode-0.98/contrib/grab-0.0.4.tar.gz | Bin 28320 -> 0 bytes
.../barcode-0.98/contrib/grab-0.0.4.tar.gz.README | 13 -
bc-backends/barcode-0.98/debian/README.debian | 9 -
bc-backends/barcode-0.98/debian/changelog | 27 -
bc-backends/barcode-0.98/debian/control | 14 -
bc-backends/barcode-0.98/debian/copyright | 8 -
bc-backends/barcode-0.98/debian/dirs | 3 -
bc-backends/barcode-0.98/debian/info | 15 -
bc-backends/barcode-0.98/debian/rules | 50 -
bc-backends/barcode-0.98/doc/Makefile.in | 135 -
bc-backends/barcode-0.98/doc/README | 5 -
bc-backends/barcode-0.98/doc/barcode.info | 747 -
bc-backends/barcode-0.98/doc/barcode.pdf | Bin 192464 -> 0 bytes
bc-backends/barcode-0.98/doc/barcode.ps | 2378 ---
bc-backends/barcode-0.98/doc/barcodedoc.txt | 734 -
bc-backends/barcode-0.98/doc/doc.barcode | 939 --
bc-backends/barcode-0.98/doc/infofilter | 16 -
bc-backends/barcode-0.98/doc/manpager | 120 -
bc-backends/barcode-0.98/doc/mktxt | 38 -
bc-backends/barcode-0.98/doc/texi2html | 2021 ---
bc-backends/barcode-0.98/ean.c | 774 -
bc-backends/barcode-0.98/i25.c | 164 -
bc-backends/barcode-0.98/install-sh | 238 -
bc-backends/barcode-0.98/library.c | 244 -
bc-backends/barcode-0.98/main.c | 604 -
bc-backends/barcode-0.98/missing | 198 -
bc-backends/barcode-0.98/mkinstalldirs | 40 -
bc-backends/barcode-0.98/msi.c | 155 -
bc-backends/barcode-0.98/pcl.c | 200 -
bc-backends/barcode-0.98/plessey.c | 164 -
bc-backends/barcode-0.98/ps.c | 272 -
bc-backends/barcode-0.98/sample.c | 98 -
bc-backends/iec16022-0.2.1/BUGS | 6 -
bc-backends/iec16022-0.2.1/CHANGELOG | 26 -
bc-backends/iec16022-0.2.1/CREDITS | 10 -
bc-backends/iec16022-0.2.1/INSTALL | 8 -
bc-backends/iec16022-0.2.1/LICENSE | 340 -
bc-backends/iec16022-0.2.1/Makefile.am | 35 -
bc-backends/iec16022-0.2.1/Makefile.dist | 40 -
bc-backends/iec16022-0.2.1/README | 13 -
bc-backends/iec16022-0.2.1/README.glabels | 6 -
bc-backends/iec16022-0.2.1/TODO | 9 -
bc-backends/iec16022-0.2.1/iec16022.1 | 52 -
bc-backends/iec16022-0.2.1/iec16022.c | 462 -
bc-backends/iec16022-0.2.1/iec16022ecc200.c | 963 --
bc-backends/iec16022-0.2.1/iec16022ecc200.h | 47 -
bc-backends/iec16022-0.2.1/image.c | 668 -
bc-backends/iec16022-0.2.1/image.h | 49 -
bc-backends/iec16022-0.2.1/reedsol.c | 172 -
bc-backends/iec16022-0.2.1/reedsol.h | 29 -
.../iec16022-0.2.1/test/testsuite-example.bin | 1 -
.../iec16022-0.2.1/test/testsuite-example.eps | 15 -
.../iec16022-0.2.1/test/testsuite-example.hex | 2 -
.../iec16022-0.2.1/test/testsuite-example.png | Bin 412 -> 0 bytes
.../iec16022-0.2.1/test/testsuite-example.text | 32 -
bc-backends/iec16022-0.2.1/test/testsuite.sh | 19 -
bc-backends/qrencode-3.1.0/COPYING | 510 -
bc-backends/qrencode-3.1.0/ChangeLog | 447 -
bc-backends/qrencode-3.1.0/Doxyfile | 1252 --
bc-backends/qrencode-3.1.0/Makefile.am | 66 -
bc-backends/qrencode-3.1.0/Makefile.am.dist | 36 -
bc-backends/qrencode-3.1.0/Makefile.in.dist | 944 --
bc-backends/qrencode-3.1.0/NEWS | 149 -
bc-backends/qrencode-3.1.0/README | 115 -
bc-backends/qrencode-3.1.0/README.glabels | 8 -
bc-backends/qrencode-3.1.0/TODO | 12 -
bc-backends/qrencode-3.1.0/aclocal.m4 | 9217 ------------
bc-backends/qrencode-3.1.0/autogen.sh | 30 -
bc-backends/qrencode-3.1.0/bitstream.c | 235 -
bc-backends/qrencode-3.1.0/bitstream.h | 38 -
bc-backends/qrencode-3.1.0/config.h.in | 75 -
bc-backends/qrencode-3.1.0/configure |15327 --------------------
bc-backends/qrencode-3.1.0/configure.ac.dist | 102 -
bc-backends/qrencode-3.1.0/libqrencode.pc.in | 9 -
bc-backends/qrencode-3.1.0/mask.c | 296 -
bc-backends/qrencode-3.1.0/mask.h | 30 -
bc-backends/qrencode-3.1.0/qrenc.c | 453 -
bc-backends/qrencode-3.1.0/qrencode.1.in | 73 -
bc-backends/qrencode-3.1.0/qrencode.c | 634 -
bc-backends/qrencode-3.1.0/qrencode.h | 426 -
bc-backends/qrencode-3.1.0/qrencode.spec | 70 -
bc-backends/qrencode-3.1.0/qrencode.spec.in | 70 -
bc-backends/qrencode-3.1.0/qrencode_inner.h | 81 -
bc-backends/qrencode-3.1.0/qrinput.c | 1329 --
bc-backends/qrencode-3.1.0/qrinput.h | 103 -
bc-backends/qrencode-3.1.0/qrspec.c | 540 -
bc-backends/qrencode-3.1.0/qrspec.h | 171 -
bc-backends/qrencode-3.1.0/rscode.c | 304 -
bc-backends/qrencode-3.1.0/rscode.h | 42 -
bc-backends/qrencode-3.1.0/split.c | 297 -
bc-backends/qrencode-3.1.0/split.h | 47 -
bc-backends/qrencode-3.1.0/tests/Makefile.am | 47 -
bc-backends/qrencode-3.1.0/tests/Makefile.in | 599 -
bc-backends/qrencode-3.1.0/tests/common.h | 199 -
.../qrencode-3.1.0/tests/create_frame_pattern.c | 170 -
bc-backends/qrencode-3.1.0/tests/frame | Bin 477320 -> 0 bytes
bc-backends/qrencode-3.1.0/tests/prof_qrencode.c | 77 -
bc-backends/qrencode-3.1.0/tests/test_all.sh | 9 -
bc-backends/qrencode-3.1.0/tests/test_bitstream.c | 150 -
.../qrencode-3.1.0/tests/test_estimatebit.c | 158 -
bc-backends/qrencode-3.1.0/tests/test_monkey.c | 326 -
bc-backends/qrencode-3.1.0/tests/test_qrencode.c | 698 -
bc-backends/qrencode-3.1.0/tests/test_qrinput.c | 835 --
bc-backends/qrencode-3.1.0/tests/test_qrspec.c | 307 -
bc-backends/qrencode-3.1.0/tests/test_rs.c | 38 -
bc-backends/qrencode-3.1.0/tests/test_split.c | 414 -
bc-backends/qrencode-3.1.0/tests/view_qrcode.c | 497 -
bc-backends/qrencode-3.1.0/use/compile | 142 -
bc-backends/qrencode-3.1.0/use/config.guess | 1526 --
bc-backends/qrencode-3.1.0/use/config.sub | 1658 ---
bc-backends/qrencode-3.1.0/use/depcomp | 589 -
bc-backends/qrencode-3.1.0/use/install-sh | 519 -
bc-backends/qrencode-3.1.0/use/ltmain.sh | 8412 -----------
bc-backends/qrencode-3.1.0/use/missing | 367 -
configure.in | 92 +-
po/POTFILES.in | 1 -
src/Makefile.am | 36 +-
src/bc-gnubarcode.c | 4 +
src/bc-iec16022.c | 4 +
src/bc-iec18004.c | 4 +
src/bc.c | 12 +
152 files changed, 116 insertions(+), 74746 deletions(-)
---
diff --git a/AUTHORS b/AUTHORS
index f441553..5ac3548 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -6,26 +6,16 @@ Jim Evins <evins snaught com>
Acknowledgments
===============
-- The GNU Barcode Library provides a large chunk of the barcode functionality
-and is distributed with glabels. See ./barcode-0.98/README for more
-information. The author:
-
- Alessandro Rubini <rubini gnu org>
-
-- The iec16022 library provides encoding for 2D barcodes. See
-iec16022-0.2.1/README for more information.
-
-- The qrencode library provides encoding for 2D barcodes. See
-qrencode-3.1.0/README for more information.
-
-- Glabels includes a modified version of the gimpchainbutton widget from the
+Glabels includes a modified version of the gimpchainbutton widget from the
gimp, as well as several stock icons from the gimp's default theme.
These are copyright:
* Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball
* Copyright (C) 1999-2000 Sven Neumann <sven gimp org>
+
Glabels includes contributions from:
+
Frederic Ruaudel <grumz users sf net>
Emmanuel Pacaud <emmanuel pacaud univ-poitiers fr>
Wayne Schuller <k_wayne linuxpower org>
@@ -43,28 +33,11 @@ Glabels includes contributions from:
Peter Cherriman <glabels-devel2712 bubieyehyeh me uk>
Daniel Mueller <daniel danm de>
+
Translations:
- Olivier Berger <oberger april org> -- French (original)
- Florent Morel <florent taket org> -- French (2.0.2)
- Claude Paroz <claude 2xlibre net> -- French (2.1.4)
- Marcus Bauer <m 7n7 de> -- German (original)
- Christian Neumair <christian-neumair web de> -- German (1.89.1)
- Mario Blättermann <mario blaettermann t-online de> -- German (2.2.5)
- Takeshi AIHANA <aihana gnome gr jp> -- Japanese
- Paulo Rogério Ormenese <pormenese uol com br> -- Brazilian Portuguese
- VÃctor Moral <victor pasmao net> -- Spanish
- sergio rivadero <sergiorivadero argentina com> -- Spanish (2.0.3)
- Vitaly Lipatov <lav altlinux ru> -- Russian
- Shell, Hin-lik Hung <shell home shellhung org> -- Chinese (TW)
- Arkadiusz Lipiec <A Lipiec elka pw edu pl> -- Polish
- David Makovský (Yakeen) <yakeen sannyas-on net> -- Czech
- Zbynek Mrkvicka <zbynek oachot cz> -- Czech (2.0.3)
- Mancio <mancio_and yahoo it> -- Italian
- Daniele Medri <daniele medri libero it> -- Italian (2.0.3)
- Antonio C. Codazzi "la Filozofo" <f_sophia libero it> -- Esperanto
- David Planella <david planella gmail com> -- Catalan
- Careon <zzbusagain yahoo com cn> -- Chinese (CN)
+ See individual po files for credits.
+
The following people have submitted label templates or information about
particular products (I apologize if I have missed anybody):
diff --git a/COPYING.README_FIRST b/COPYING.README_FIRST
index ac9a6c9..06eea6d 100644
--- a/COPYING.README_FIRST
+++ b/COPYING.README_FIRST
@@ -34,18 +34,3 @@ TEMPLATE DATABASE:
the database. However, to clear up any ambiguity, the files themselves
are licensed using the MIT/X license -- see 'COPYING-TEMPLATES' in this
directory for details.
-
-
-3RD PARTY COMPONENTS:
-
- The "bc-backends/barcode-0.98/" and "bc-backends/iec16022-0.2.1/"
- subdirectories contain 3rd party libraries, each licensed under the
- GNU GENERAL PUBLIC LICENSE (GPL); either version 2 of the License,
- or (at your option) any later version -- see the 'LICENSE' or 'COPYING'
- file in each of these directories for details.
-
- The "bc-backends/qrencode-3.1.0/" subdirectory contains a 3rd party
- library, it is licensed under the GNU LESSER GENERAL PUBLIC LICENSE (LGPL);
- either version 2.1 of the License, or (at your option) any later
- version -- see the 'COPYING' file in this subdirectory for details.
-
diff --git a/Makefile.am b/Makefile.am
index a86b7e3..e77a9a4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,6 @@
SUBDIRS = \
po \
- bc-backends \
libglabels \
src \
data \
diff --git a/configure.in b/configure.in
index eac95d9..2b21499 100644
--- a/configure.in
+++ b/configure.in
@@ -59,12 +59,14 @@ dnl - Library dependencies
dnl ---------------------------------------------------------------------------
GLIB_REQUIRED=2.20.0
GTK_REQUIRED=2.16.0
+GCONF_REQUIRED=2.26.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(GCONF_REQUIRED)
AC_SUBST(LIBXML_REQUIRED)
AC_SUBST(LIBEBOOK_REQUIRED)
@@ -93,6 +95,7 @@ dnl ---------------------------------------------------------------------------
PKG_CHECK_MODULES(GLABELS, \
glib-2.0 >= $GLIB_REQUIRED \
gtk+-2.0 >= $GTK_REQUIRED \
+gconf-2.0 >= $GCONF_REQUIRED \
libxml-2.0 >= $LIBXML_REQUIRED \
$OPTIONAL_MODULES \
)
@@ -106,6 +109,7 @@ dnl - LIBGLABELS more modest prerequisites
dnl ---------------------------------------------------------------------------
PKG_CHECK_MODULES(LIBGLABELS, \
glib-2.0 >= $GLIB_REQUIRED \
+gconf-2.0 >= $GCONF_REQUIRED \
libxml-2.0 >= $LIBXML_REQUIRED \
)
@@ -114,6 +118,67 @@ AC_SUBST(LIBGLABELS_LIBS)
dnl ---------------------------------------------------------------------------
+dnl - Check for GNU Barcode backend
+dnl ---------------------------------------------------------------------------
+AC_ARG_WITH(libbarcode,
+ [AC_HELP_STRING([--without-libbarcode],
+ [build without GNU Barcode support])])
+have_libbarcode=no
+if test "x$with_libbarcode" != xno; then
+ AC_CHECK_LIB(barcode, Barcode_Create,
+ [have_libbarcode=yes], [have_libbarcode=no])
+fi
+
+if test "x$have_libbarcode" = "xyes"; then
+ AC_DEFINE(HAVE_LIBBARCODE,1,[Define to 1 for GNU Barcode support])
+ LIBBARCODE_CFLAGS=""
+ LIBBARCODE_LIBS="-lbarcode"
+ AC_SUBST(LIBBARCODE_CFLAGS)
+ AC_SUBST(LIBBARCODE_LIBS)
+fi
+
+
+dnl ---------------------------------------------------------------------------
+dnl - Check for QRencode Barcode backend
+dnl ---------------------------------------------------------------------------
+AC_ARG_WITH(libqrencode,
+ [AC_HELP_STRING([--without-libqrencode],
+ [build without QRencode support])])
+have_libqrencode=no
+if test "x$with_libqrencode" != xno; then
+ PKG_CHECK_MODULES(LIBQRENCODE, libqrencode >= 3.1.0,
+ [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_SUBST(LIBQRENCODE_CFLAGS)
+ AC_SUBST(LIBQRENCODE_LIBS)
+fi
+
+
+dnl ---------------------------------------------------------------------------
+dnl - Check for IEC16022 Barcode backend
+dnl ---------------------------------------------------------------------------
+AC_ARG_WITH(libiec16022,
+ [AC_HELP_STRING([--without-libiec16022],
+ [build without Iec16022 support])])
+have_libiec16022=no
+if test "x$with_libiec16022" != xno; then
+ AC_CHECK_LIB(iec16022, iec16022ecc200,
+ [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])
+ LIBIEC16022_CFLAGS=""
+ LIBIEC16022_LIBS="-liec16022"
+ AC_SUBST(LIBIEC16022_CFLAGS)
+ AC_SUBST(LIBIEC16022_LIBS)
+fi
+
+
+dnl ---------------------------------------------------------------------------
dnl - Enable deprecation testing
dnl ---------------------------------------------------------------------------
AC_ARG_ENABLE(deprecations,
@@ -163,22 +228,10 @@ 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 ---------------------------------------------------------------------------
AC_OUTPUT([
Makefile
-bc-backends/Makefile
-bc-backends/barcode-0.98/Makefile
-bc-backends/iec16022-0.2.1/Makefile
-bc-backends/qrencode-3.1.0/Makefile
libglabels/Makefile
libglabels/libglabels.pc
src/Makefile
@@ -205,11 +258,16 @@ dnl ---------------------------------------------------------------------------
echo "
Configuration:
- Package: ${PACKAGE}-${VERSION}:
- Installation prefix ${prefix}
- Source code location: ${srcdir}
- Compiler: ${CC}
- Evolution Data Server support: ${have_libebook}
+ Package........................: ${PACKAGE}-${VERSION}:
+ Installation prefix............: ${prefix}
+ Source code location...........: ${srcdir}
+ Compiler.......................: ${CC}
+
+ Evolution Data Server support..: ${have_libebook}
+
+ GNU Barcode support............: ${have_libbarcode}
+ QRencode Barcode support.......: ${have_libqrencode}
+ IEC16022 Barcode support.......: ${have_libiec16022}
"
diff --git a/po/POTFILES.in b/po/POTFILES.in
index a6469db..de755fa 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,6 +1,5 @@
# List of source files containing translatable strings.
-bc-backends/barcode-0.98/compat/getopt.c
src/bc.c
src/bc-gnubarcode.c
src/bc-gnubarcode.h
diff --git a/src/Makefile.am b/src/Makefile.am
index 8ce93a0..720da51 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,6 +1,3 @@
-LIB_BARCODE_DIR = ../bc-backends/barcode-0.98
-LIB_IEC16022_DIR = ../bc-backends/iec16022-0.2.1
-LIB_QRENCODE_DIR = ../bc-backends/qrencode-3.1.0
SUBDIRS= pixmaps stock-pixmaps
@@ -9,10 +6,10 @@ bin_PROGRAMS = glabels glabels-batch
INCLUDES = \
-I$(top_srcdir) \
-I$(top_builddir) \
- -I$(LIB_BARCODE_DIR) \
- -I$(LIB_IEC16022_DIR) \
- -I$(LIB_QRENCODE_DIR) \
$(GLABELS_CFLAGS) \
+ $(LIBBARCODE_CFLAGS) \
+ $(LIBQRENCODE_CFLAGS) \
+ $(LIBIEC16022_CFLAGS) \
$(DISABLE_DEPRECATED_CFLAGS) \
-DPREFIX=\""$(prefix)"\" \
-DSYSCONFDIR=\""$(sysconfdir)"\" \
@@ -20,7 +17,7 @@ INCLUDES = \
-DLIBDIR=\""$(libdir)"\" \
-DGLABELS_LOCALEDIR=\""$(datadir)/locale"\" \
-DGLABELS_BUILDER_DIR=\""$(datadir)/glabels/builder/"\" \
- -DGLABELS_ICON_DIR=\""$(datadir)/pixmaps/"\" \
+ -DGLABELS_ICON_DIR=\""$(datadir)/pixmaps/"\" \
-DGLABELS_PIXMAP_DIR=\""$(datadir)/pixmaps/glabels/"\" \
-DG_LOG_DOMAIN=\""glabels\""
@@ -29,18 +26,18 @@ glabels_LDFLAGS = -export-dynamic
glabels_LDADD = \
$(GLABELS_LIBS) \
../libglabels/libglabels.la \
- $(LIB_BARCODE_DIR)/libbarcode.la \
- $(LIB_IEC16022_DIR)/libiec16022.la \
- $(LIB_QRENCODE_DIR)/libqrencode.la
+ $(LIBBARCODE_LIBS) \
+ $(LIBQRENCODE_LIBS) \
+ $(LIBIEC16022_LIBS)
glabels_batch_LDFLAGS = -export-dynamic
glabels_batch_LDADD = \
$(GLABELS_LIBS) \
../libglabels/libglabels.la \
- $(LIB_BARCODE_DIR)/libbarcode.la \
- $(LIB_IEC16022_DIR)/libiec16022.la \
- $(LIB_QRENCODE_DIR)/libqrencode.la
+ $(LIBBARCODE_LIBS) \
+ $(LIBQRENCODE_LIBS) \
+ $(LIBIEC16022_LIBS)
BUILT_SOURCES = \
marshal.c \
@@ -305,18 +302,7 @@ EXTRA_DIST = \
CLEANFILES = $(BUILT_SOURCES)
-$(bin_PROGRAMS): $(LIB_BARCODE_DIR)/libbarcode.la \
- $(LIB_IEC16022_DIR)/libiec16022.la \
- ../libglabels/libglabels.la
-
-$(LIB_BARCODE_DIR)/libbarcode.la:
- cd $(LIB_BARCODE_DIR); $(MAKE)
-
-$(LIB_IEC16022_DIR)/libiec16022.la:
- cd $(LIB_IEC16022_DIR); $(MAKE)
-
-$(LIB_QRENCODE_DIR)/libqrencode.la:
- cd $(LIB_QRENCODE_DIR); $(MAKE)
+$(bin_PROGRAMS): ../libglabels/libglabels.la
../libglabels/libglabels.la:
cd ../libglabels; $(MAKE)
diff --git a/src/bc-gnubarcode.c b/src/bc-gnubarcode.c
index 6ce051d..060fc61 100644
--- a/src/bc-gnubarcode.c
+++ b/src/bc-gnubarcode.c
@@ -20,6 +20,8 @@
#include <config.h>
+#ifdef HAVE_LIBBARCODE
+
#include "bc-gnubarcode.h"
#include <glib.h>
@@ -438,6 +440,8 @@ is_length2_valid (const gchar *digits,
return (i >= n1) && (i <= n2);
}
+#endif /* HAVE_LIBBARCODE */
+
/*
diff --git a/src/bc-iec16022.c b/src/bc-iec16022.c
index 3ccdc04..ebaa4e6 100644
--- a/src/bc-iec16022.c
+++ b/src/bc-iec16022.c
@@ -20,6 +20,8 @@
#include <config.h>
+#ifdef HAVE_LIBIEC16022
+
#include "bc-iec16022.h"
#include <glib.h>
@@ -144,6 +146,8 @@ render_iec16022 (const gchar *grid,
return gbc;
}
+#endif /* HAVE_LIBIEC16022 */
+
/*
diff --git a/src/bc-iec18004.c b/src/bc-iec18004.c
index bef0fd8..7070fca 100644
--- a/src/bc-iec18004.c
+++ b/src/bc-iec18004.c
@@ -20,6 +20,8 @@
#include <config.h>
+#ifdef HAVE_LIBQRENCODE
+
#include "bc-iec18004.h"
#include <glib.h>
@@ -153,6 +155,8 @@ render_iec18004 (const gchar *grid,
return gbc;
}
+#endif /* HAVE_LIBQRENCODE */
+
/*
diff --git a/src/bc.c b/src/bc.c
index 98ca58e..569d0d6 100644
--- a/src/bc.c
+++ b/src/bc.c
@@ -74,6 +74,8 @@ static const Backend backends[] = {
{ "POSTNET-11", N_("POSTNET-11 (DPBC)"), gl_barcode_postnet_new,
FALSE, FALSE, TRUE, FALSE, "12345-6789-12", FALSE, 11},
+#ifdef HAVE_LIBBARCODE
+
{ "CEPNET", N_("CEPNET"), gl_barcode_postnet_new,
FALSE, FALSE, TRUE, FALSE, "12345-678", FALSE, 8},
@@ -149,12 +151,22 @@ static const Backend backends[] = {
{ "PLS", N_("Plessey"), gl_barcode_gnubarcode_new,
TRUE, TRUE, TRUE, TRUE, "0000000000", TRUE, 10},
+#endif /* HAVE_LIBBARCODE */
+
+#ifdef HAVE_LIBIEC16022
+
{ "IEC16022", N_("IEC16022 (DataMatrix)"), gl_barcode_iec16022_new,
FALSE, FALSE, TRUE, FALSE, "12345678", TRUE, 8},
+#endif /* HAVE_LIBIEC16022 */
+
+#ifdef HAVE_LIBQRENCODE
+
{ "IEC18004", N_("IEC18004 (QRCode)"), gl_barcode_iec18004_new,
FALSE, FALSE, TRUE, FALSE, "12345678", TRUE, 8},
+#endif /* HAVE_LIBQRENCODE */
+
{ NULL, NULL, NULL, FALSE, FALSE, FALSE, FALSE, NULL, FALSE, 0}
};
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
