claunia/libcdio-osx
Archived
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Use LTLIBICONV instead of LIBICONV. Bug #25201 from Yaakov Selkowitz

Browse Source
This commit is contained in:
R. Bernstein
2008-12-28 23:09:25 -05:00
parent 7ec21fe4e1
commit 860becb14c
8 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
configure.ac
View File

@@ -412,6 +412,7 @@ int has_timeout=sizeof(test.timeout);],
AC_DEFINE([HAVE_WIN32_CDROM], [1], AC_DEFINE([HAVE_WIN32_CDROM], [1],
[Define 1 if you have MinGW CD-ROM support]) [Define 1 if you have MinGW CD-ROM support])
LIBS="$LIBS -lwinmm" LIBS="$LIBS -lwinmm"
LT_NO_UNDEFINED="-no-undefined"
cd_drivers="${cd_drivers}, MinGW" cd_drivers="${cd_drivers}, MinGW"
AC_DEFINE([NEED_TIMEZONEVAR], [1], AC_DEFINE([NEED_TIMEZONEVAR], [1],
[Define 1 if you need timezone defined to get timzone [Define 1 if you need timezone defined to get timzone

1
include/cdio/paranoia.h
View File

@@ -175,6 +175,7 @@ extern "C" {
#ifndef DO_NOT_WANT_PARANOIA_COMPATIBILITY #ifndef DO_NOT_WANT_PARANOIA_COMPATIBILITY
/** For compatibility with good ol' paranoia */ /** For compatibility with good ol' paranoia */
#define cdrom_paranoia cdrom_paranoia_t
#define paranoia_init cdio_paranoia_init #define paranoia_init cdio_paranoia_init
#define paranoia_free cdio_paranoia_free #define paranoia_free cdio_paranoia_free
#define paranoia_modeset cdio_paranoia_modeset #define paranoia_modeset cdio_paranoia_modeset

5
include/cdio/sector.h
View File

@@ -269,6 +269,11 @@
} }
#endif #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_ */ #endif /* _CDIO_SECTOR_H_ */

5
lib/cdio++/Makefile.am
View File

@@ -50,7 +50,8 @@ libcdiopp_la_AGE = 0
libcdiopp_sources = cdio.cpp devices.cpp libcdiopp_sources = cdio.cpp devices.cpp
libcdio___la_SOURCES = $(libcdiopp_sources) 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_CURRENT = 0
libiso9660pp_la_REVISION = 0 libiso9660pp_la_REVISION = 0
@@ -60,6 +61,6 @@ libiso9660pp_sources = iso9660.cpp
libiso9660___la_SOURCES = $(libiso9660pp_sources) libiso9660___la_SOURCES = $(libiso9660pp_sources)
libiso9660___la_LIBADD = $(LIBISO9660_LIBS) $(LIBCDIO_LIBS) 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 INCLUDES = -I$(top_srcdir)/include/ -I$(top_builddir)/include

2
lib/iso9660/Makefile.am
View File

@@ -67,7 +67,7 @@ libiso9660_la_SOURCES = \
libiso9660_la_LIBADD = @LIBCDIO_LIBS@ libiso9660_la_LIBADD = @LIBCDIO_LIBS@
libiso9660_la_ldflags = -version-info $(libiso9660_la_CURRENT):$(libiso9660_la_REVISION):$(libiso9660_la_AGE) @LT_NO_UNDEFINED@ 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) INCLUDES = $(LIBCDIO_CFLAGS)

2
libcdio.pc.in
View File

@@ -7,5 +7,5 @@ Name: @PACKAGE_NAME@
Description: Portable CD-ROM I/O library Description: Portable CD-ROM I/O library
Version: @PACKAGE_VERSION@ Version: @PACKAGE_VERSION@
#Requires: glib-2.0 #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} Cflags: -I${includedir}

4
libiso9660++.pc.in
View File

@@ -2,11 +2,11 @@ prefix=@prefix@
exec_prefix=@exec_prefix@ exec_prefix=@exec_prefix@
libdir=@libdir@ libdir=@libdir@
includedir=@includedir@ includedir=@includedir@
libiconv=@LIBICONV@ libiconv=@LTLIBICONV@
Name: libiso9660++ Name: libiso9660++
Description: C++ OO ISO-9660 library of libcdio Description: C++ OO ISO-9660 library of libcdio
Version: @PACKAGE_VERSION@ Version: @PACKAGE_VERSION@
Requires: libcdio Requires: libcdio
Libs: -L${libdir} -liso9660++ -lcdio++ -liso9660 @LIBICONV@ -lcdio Libs: -L${libdir} -liso9660++ -lcdio++ -liso9660 @LTLIBICONV@ -lcdio
Cflags: -I${includedir} Cflags: -I${includedir}

4
libiso9660.pc.in
View File

@@ -2,11 +2,11 @@ prefix=@prefix@
exec_prefix=@exec_prefix@ exec_prefix=@exec_prefix@
libdir=@libdir@ libdir=@libdir@
includedir=@includedir@ includedir=@includedir@
libiconv=@LIBICONV@ libiconv=@LTLIBICONV@
Name: libiso9660 Name: libiso9660
Description: ISO-9660 library of libcdio Description: ISO-9660 library of libcdio
Version: @PACKAGE_VERSION@ Version: @PACKAGE_VERSION@
Requires: libcdio Requires: libcdio
Libs: -L${libdir} -liso9660 @LIBICONV@ -lcdio Libs: -L${libdir} -liso9660 @LTLIBICONV@ -lcdio
Cflags: -I${includedir} Cflags: -I${includedir}