Fixes for making libcdio work with pkg-config on Darwin when linking

vcdimager and when linking just libcdio. From Steven M. Schultz:

  I blew a couple minutes tinkering with libcdio.pc and found that
  manually adding a quote character (not even a matched set of quotes!)
  around the second -framework was enough.

  What works for now is manually editing libcdio.pc after it's been
  installed:

   Libs: -L${libdir} -lcdio  -lm  -Wl,-framework -Wl,CoreFoundation -Wl,-framework -Wl,IOKit

  to:

   Libs: -L${libdir} -lcdio  -lm  -Wl,-framework -Wl,CoreFoundation "-Wl,-framework" -Wl,IOKit

  is enough to get vcdimager compiled and linked.

  Appears that the thing to do is somehow get the quotes into
  libcdio.pc but not into $LIBS - or something like that at any rate.
This commit is contained in:
rocky
2004-08-19 01:12:27 +00:00
parent df540d7da5
commit 34749d84ae
2 changed files with 5 additions and 3 deletions

View File

@@ -19,7 +19,7 @@ define(RELEASE_NUM, 70)
define(CDIO_VERSION_STR, 0.$1cvs)
AC_PREREQ(2.52)
AC_REVISION([$Id: configure.ac,v 1.90 2004/06/27 16:25:16 rocky Exp $])dnl
AC_REVISION([$Id: configure.ac,v 1.91 2004/08/19 01:12:27 rocky Exp $])dnl
AC_INIT(libcdio, CDIO_VERSION_STR(RELEASE_NUM))
AC_CONFIG_SRCDIR(src/cd-info.c)
AM_INIT_AUTOMAKE
@@ -237,7 +237,8 @@ case $host_os in
if test "x$have_iokit_h" = "xyes" ; then
AC_DEFINE([HAVE_DARWIN_CDROM], [1],
[Define 1 if you have Darwin OS X-type CD-ROM support])
LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation -Wl,\\\"-framework\\\" -Wl,IOKit"
LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
DARWIN_PKG_LIB_HACK="\"-Wl,-framework\" -Wl,IOKit"
cd_drivers="${cd_drivers}, Darwin"
fi
;;
@@ -299,6 +300,7 @@ int has_timeout=sizeof(test.timeout);],
;;
esac
AC_SUBST(LINUX_CDROM_TIMEOUT)
AC_SUBST(DARWIN_PKG_LIB_HACK)
AC_SUBST(HAVE_BSDI_CDROM)
AC_SUBST(HAVE_DARWIN_CDROM)
AC_SUBST(HAVE_FREEBSD_CDROM)

View File

@@ -7,5 +7,5 @@ Name: libcdio
Description: Portable CD-ROM I/O library
Version: @VERSION@
#Requires: glib-2.0
Libs: -L${libdir} -lcdio @LIBS@
Libs: -L${libdir} -lcdio @LIBS@ @DARWIN_PKG_LIB_HACK@
Cflags: -I${includedir}