From d58ce669d9e7209e025995d5e612d1648a13e79b Mon Sep 17 00:00:00 2001
From: pjcreath <pjcreath>
Date: Tue, 25 Oct 2005 14:16:41 +0000
Subject: [PATCH] Fixed Darwin builds broken by dependency tracking.

---
 configure.ac                | 9 ++++++---
 example/Makefile.am         | 4 ++--
 src/cd-paranoia/Makefile.am | 4 ++--
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/configure.ac b/configure.ac
index 0948ab2e..aaa23886 100644
--- a/configure.ac
+++ b/configure.ac
@@ -19,7 +19,7 @@ define(RELEASE_NUM, 77)
 define(CDIO_VERSION_STR, 0.$1cvs)
 
 AC_PREREQ(2.52)
-AC_REVISION([$Id: configure.ac,v 1.176 2005/10/24 03:12:30 rocky Exp $])dnl
+AC_REVISION([$Id: configure.ac,v 1.177 2005/10/25 14:16:41 pjcreath Exp $])dnl
 AC_INIT(libcdio, CDIO_VERSION_STR(RELEASE_NUM))
 AC_CONFIG_SRCDIR(src/cd-info.c)
 
@@ -336,6 +336,7 @@ dnl Checks for header files.
 LIBCDIO_CDDA_LIBS='$(top_builddir)/lib/cdda_interface/libcdio_cdda.la'
 LIBCDIO_CFLAGS='-I$(top_srcdir)/lib/driver -I$(top_srcdir)/include/'
 LIBCDIO_LIBS='$(top_builddir)/lib/driver/libcdio.la'
+LIBCDIO_DEPS="$LIBCDIO_LIBS"
 LIBCDIO_PARANOIA_LIBS='$(top_builddir)/lib/paranoia/libcdio_paranoia.la'
 LIBISO9660_CFLAGS='-I$(top_srcdir)/lib/iso9660/'
 LIBISO9660_LIBS='$(top_builddir)/lib/iso9660/libiso9660.la'
@@ -345,6 +346,7 @@ AC_SUBST(LIBCDIO_CDDA_LIBS)
 AC_SUBST(LIBCDIO_CFLAGS)
 AC_SUBST(LIBISO9660_CFLAGS)
 AC_SUBST(LIBCDIO_LIBS)
+AC_SUBST(LIBCDIO_DEPS)
 AC_SUBST(LIBCDIO_PARANOIA_LIBS)
 AC_SUBST(LIBISO9660_LIBS)
 AC_SUBST(LIBUDF_LIBS)
@@ -362,8 +364,9 @@ 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])
-         LIBCDIO_LIBS="$LIBCDIO_LIBS  -Wl,-framework -Wl,CoreFoundation -Wl,-framework -Wl,IOKit"
-	 DARWIN_PKG_LIB_HACK=" -Wl,-framework -Wl,CoreFoundation \"-Wl,-framework -Wl,IOKit\""
+	 DARWIN_PKG_LIB_HACK="-Wl,-framework,CoreFoundation -Wl,-framework,IOKit"
+	 AC_SUBST(DARWIN_PKG_LIB_HACK)
+	 LIBCDIO_LIBS="$LIBCDIO_LIBS $DARWIN_PKG_LIB_HACK"
          cd_drivers="${cd_drivers}, Darwin"
        fi
      ;;
diff --git a/example/Makefile.am b/example/Makefile.am
index 2d245ffd..52113cd3 100644
--- a/example/Makefile.am
+++ b/example/Makefile.am
@@ -1,4 +1,4 @@
-#   $Id: Makefile.am,v 1.26 2005/10/24 03:12:30 rocky Exp $
+#   $Id: Makefile.am,v 1.27 2005/10/25 14:16:41 pjcreath Exp $
 #
 #    Copyright (C) 2003, 2004, 2005 Rocky Bernstein <rocky@panix.com>
 #
@@ -58,7 +58,7 @@ sample4_LDADD = $(LIBCDIO_LIBS)
 
 tracks_LDADD  = $(LIBCDIO_LIBS)
 
-udf1_DEPENDENCIES = $(LIBUDF_LIBS) $(LIBCDIO_LIBS)
+udf1_DEPENDENCIES = $(LIBUDF_LIBS) $(LIBCDIO_DEPS)
 udf1_LDADD        = $(LIBUDF_LIBS) $(LIBCDIO_LIBS)
 
 
diff --git a/src/cd-paranoia/Makefile.am b/src/cd-paranoia/Makefile.am
index 895b3543..ce2952e2 100644
--- a/src/cd-paranoia/Makefile.am
+++ b/src/cd-paranoia/Makefile.am
@@ -1,4 +1,4 @@
-#   $Id: Makefile.am,v 1.18 2005/10/18 01:21:37 rocky Exp $
+#   $Id: Makefile.am,v 1.19 2005/10/25 14:16:41 pjcreath Exp $
 #
 #    Copyright (C) 2004, 2005 Rocky Bernstein <rocky@panix.com>
 #    Copyright (C) 1998 Monty xiphmont@mit.edu
@@ -37,7 +37,7 @@ cd_paranoia_SOURCES = cd-paranoia.c \
 
 cd_paranoia_LDADD =  $(LIBCDIO_LIBS) $(LIBCDIO_CDDA_LIBS) $(LIBCDIO_PARANOIA_LIBS) @LIBGETOPT_LIB@
 
-cd_paranoia_DEPENDENCIES =  $(LIBCDIO_LIBS) $(LIBCDIO_CDDA_LIBS) $(LIBCDIO_PARANOIA_LIBS) @LIBGETOPT_LIB@
+cd_paranoia_DEPENDENCIES =  $(LIBCDIO_DEPS) $(LIBCDIO_CDDA_LIBS) $(LIBCDIO_PARANOIA_LIBS) @LIBGETOPT_LIB@
 
 
 bin_PROGRAMS = cd-paranoia