From 860becb14ca92e3726e5105fbf8c5a0ae2b11854 Mon Sep 17 00:00:00 2001
From: "R. Bernstein" <rocky@gnu.org>
Date: Sun, 28 Dec 2008 23:09:25 -0500
Subject: [PATCH] Use LTLIBICONV instead of LIBICONV. Bug #25201 from Yaakov
 Selkowitz

---
 configure.ac            | 1 +
 include/cdio/paranoia.h | 1 +
 include/cdio/sector.h   | 5 +++++
 lib/cdio++/Makefile.am  | 5 +++--
 lib/iso9660/Makefile.am | 2 +-
 libcdio.pc.in           | 2 +-
 libiso9660++.pc.in      | 4 ++--
 libiso9660.pc.in        | 4 ++--
 8 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/configure.ac b/configure.ac
index 23ef8ffe..a64e0e30 100644
--- a/configure.ac
+++ b/configure.ac
@@ -412,6 +412,7 @@ int has_timeout=sizeof(test.timeout);],
      	AC_DEFINE([HAVE_WIN32_CDROM], [1], 
                   [Define 1 if you have MinGW CD-ROM support])
  	LIBS="$LIBS -lwinmm"
+ 	LT_NO_UNDEFINED="-no-undefined"
   	cd_drivers="${cd_drivers}, MinGW"
      	AC_DEFINE([NEED_TIMEZONEVAR], [1], 
                   [Define 1 if you need timezone defined to get timzone
diff --git a/include/cdio/paranoia.h b/include/cdio/paranoia.h
index dee8dd31..02b50002 100644
--- a/include/cdio/paranoia.h
+++ b/include/cdio/paranoia.h
@@ -175,6 +175,7 @@ extern "C" {
 
 #ifndef DO_NOT_WANT_PARANOIA_COMPATIBILITY
 /** For compatibility with good ol' paranoia */
+#define cdrom_paranoia        cdrom_paranoia_t
 #define paranoia_init         cdio_paranoia_init
 #define paranoia_free         cdio_paranoia_free
 #define paranoia_modeset      cdio_paranoia_modeset
diff --git a/include/cdio/sector.h b/include/cdio/sector.h
index 056433d9..6e308338 100644
--- a/include/cdio/sector.h
+++ b/include/cdio/sector.h
@@ -269,6 +269,11 @@
     }
 #endif
 
+#ifndef DO_NOT_WANT_PARANOIA_COMPATIBILITY
+/** For compatibility with good ol' paranoia */
+#define CD_FRAMESIZE_RAW        CDIO_CD_FRAMESIZE_RAW
+#endif /*DO_NOT_WANT_PARANOIA_COMPATIBILITY*/
+
 #endif /* _CDIO_SECTOR_H_ */
 
 
diff --git a/lib/cdio++/Makefile.am b/lib/cdio++/Makefile.am
index 5e65b981..ceb6c6bf 100644
--- a/lib/cdio++/Makefile.am
+++ b/lib/cdio++/Makefile.am
@@ -50,7 +50,8 @@ libcdiopp_la_AGE = 0
 libcdiopp_sources = cdio.cpp devices.cpp
 
 libcdio___la_SOURCES = $(libcdiopp_sources)
-libcdio___la_ldflags = -version-info $(libcdiopp_la_CURRENT):$(libcdiopp_la_REVISION):$(libcdiopp_la_AGE) @LT_NO_UNDEFINED@
+libcdio___la_LDFLAGS = -version-info $(libcdiopp_la_CURRENT):$(libcdiopp_la_REVISION):$(libcdiopp_la_AGE) @LT_NO_UNDEFINED@
+libcdio___la_LIBADD = $(top_builddir)/lib/driver/libcdio.la
 
 libiso9660pp_la_CURRENT = 0
 libiso9660pp_la_REVISION = 0
@@ -60,6 +61,6 @@ 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@
+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
diff --git a/lib/iso9660/Makefile.am b/lib/iso9660/Makefile.am
index 56611332..d66cfc9d 100644
--- a/lib/iso9660/Makefile.am
+++ b/lib/iso9660/Makefile.am
@@ -67,7 +67,7 @@ libiso9660_la_SOURCES = \
 
 libiso9660_la_LIBADD = @LIBCDIO_LIBS@
 libiso9660_la_ldflags = -version-info $(libiso9660_la_CURRENT):$(libiso9660_la_REVISION):$(libiso9660_la_AGE) @LT_NO_UNDEFINED@
-libiso9660_la_dependencies = libcdio.la
+libiso9660_la_dependencies = $(top_builddir)/lib/driver/libcdio.la
 
 INCLUDES = $(LIBCDIO_CFLAGS)
 
diff --git a/libcdio.pc.in b/libcdio.pc.in
index 90474065..c0bad182 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@ @LIBICONV@ @DARWIN_PKG_LIB_HACK@
+Libs: -L${libdir} -lcdio @LIBS@ @LTLIBICONV@ @DARWIN_PKG_LIB_HACK@
 Cflags: -I${includedir}
diff --git a/libiso9660++.pc.in b/libiso9660++.pc.in
index 5c2a3028..454594e9 100644
--- a/libiso9660++.pc.in
+++ b/libiso9660++.pc.in
@@ -2,11 +2,11 @@ prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
-libiconv=@LIBICONV@
+libiconv=@LTLIBICONV@
 
 Name: libiso9660++
 Description: C++ OO ISO-9660 library of libcdio
 Version: @PACKAGE_VERSION@
 Requires: libcdio 
-Libs: -L${libdir} -liso9660++ -lcdio++ -liso9660 @LIBICONV@ -lcdio
+Libs: -L${libdir} -liso9660++ -lcdio++ -liso9660 @LTLIBICONV@ -lcdio
 Cflags: -I${includedir}
diff --git a/libiso9660.pc.in b/libiso9660.pc.in
index 983c07f0..7e0c92dc 100644
--- a/libiso9660.pc.in
+++ b/libiso9660.pc.in
@@ -2,11 +2,11 @@ prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
-libiconv=@LIBICONV@
+libiconv=@LTLIBICONV@
 
 Name: libiso9660
 Description: ISO-9660 library of libcdio
 Version: @PACKAGE_VERSION@
 Requires: libcdio 
-Libs: -L${libdir} -liso9660 @LIBICONV@ -lcdio
+Libs: -L${libdir} -liso9660 @LTLIBICONV@ -lcdio
 Cflags: -I${includedir}