From f81a660ef828cfae77e4cd0453c1cba7165d635a Mon Sep 17 00:00:00 2001 From: rocky Date: Wed, 29 Oct 2008 09:53:00 +0000 Subject: [PATCH] =?UTF-8?q?Bug=20fix=20to=20allow=20linker=20flags=20--as-?= =?UTF-8?q?needed=20and=20--no-undefined.=20Thanks=20to=20G=F6tz=20Waschk?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- configure.ac | 6 +++--- lib/cdio++/Makefile.am | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 86ca401c..a2836316 100644 --- a/configure.ac +++ b/configure.ac @@ -16,11 +16,11 @@ dnl along with this program; if not, write to the Free Software dnl Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA dnl 02110-1301 USA. -define(RELEASE_NUM, 81) -define(CDIO_VERSION_STR, 0.$1cvs) +define(RELEASE_NUM, 82cvs) +define(CDIO_VERSION_STR, 0.$1) AC_PREREQ(2.52) -AC_REVISION([$Id: configure.ac,v 1.232 2008/09/29 03:34:49 flameeyes Exp $])dnl +AC_REVISION([$Id: configure.ac,v 1.233 2008/10/29 09:53:00 rocky Exp $])dnl AC_INIT(libcdio, CDIO_VERSION_STR(RELEASE_NUM)) AC_CONFIG_SRCDIR(src/cd-info.c) diff --git a/lib/cdio++/Makefile.am b/lib/cdio++/Makefile.am index 3803b863..5e65b981 100644 --- a/lib/cdio++/Makefile.am +++ b/lib/cdio++/Makefile.am @@ -1,4 +1,4 @@ -# $Id: Makefile.am,v 1.10 2008/10/20 01:25:15 rocky Exp $ +# $Id: Makefile.am,v 1.11 2008/10/29 09:53:00 rocky Exp $ # # Copyright (C) 2005, 2006, 2007, 2008 Rocky Bernstein # @@ -59,6 +59,7 @@ libiso9660pp_la_AGE = 0 libiso9660pp_sources = iso9660.cpp libiso9660___la_SOURCES = $(libiso9660pp_sources) +libiso9660___la_LIBADD = $(LIBISO9660_LIBS) $(LIBCDIO_LIBS) libiso9660___la_ldflags = -version-info $(libiso9660pp_la_CURRENT):$(libiso9660pp_la_REVISION):$(libiso9660pp_la_AGE) @LT_NO_UNDEFINED@ INCLUDES = -I$(top_srcdir)/include/ -I$(top_builddir)/include