From 9cd49d2bd85c5aaa15a43f487cd5619706ce1b09 Mon Sep 17 00:00:00 2001 From: rocky Date: Sun, 20 Aug 2006 23:50:16 +0000 Subject: [PATCH] Patches from Steve Schultz to handle libiconv inclusion on BSDI (and possibly other BSD's) --- lib/driver/Makefile.am | 3 ++- libcdio.pc.in | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/driver/Makefile.am b/lib/driver/Makefile.am index 6284d513..6053a53d 100644 --- a/lib/driver/Makefile.am +++ b/lib/driver/Makefile.am @@ -1,4 +1,4 @@ -# $Id: Makefile.am,v 1.16 2006/06/02 21:54:21 gmerlin Exp $ +# $Id: Makefile.am,v 1.17 2006/08/20 23:50:16 rocky Exp $ # # Copyright (C) 2003, 2004, 2005, 2006 Rocky Bernstein # @@ -98,6 +98,7 @@ libcdio_sources = \ util.c lib_LTLIBRARIES = libcdio.la +libcdio_la_LIBADD = @LIBICONV@ libcdio_la_SOURCES = $(libcdio_sources) libcdio_la_ldflags = -version-info $(libcdio_la_CURRENT):$(libcdio_la_REVISION):$(libcdio_la_AGE) diff --git a/libcdio.pc.in b/libcdio.pc.in index 73dc2396..90474065 100644 --- a/libcdio.pc.in +++ b/libcdio.pc.in @@ -7,5 +7,5 @@ Name: @PACKAGE_NAME@ Description: Portable CD-ROM I/O library Version: @PACKAGE_VERSION@ #Requires: glib-2.0 -Libs: -L${libdir} -lcdio @LIBS@ @DARWIN_PKG_LIB_HACK@ +Libs: -L${libdir} -lcdio @LIBS@ @LIBICONV@ @DARWIN_PKG_LIB_HACK@ Cflags: -I${includedir}