From 0ccfd189e1039b4049576afd249dce1b563d9da0 Mon Sep 17 00:00:00 2001 From: "Gene Z. Ragan" Date: Sat, 17 Mar 2001 05:03:50 +0000 Subject: One final tweak to get the cdparanoia checks right. 2001-03-16 Gene Z. Ragan * libnautilus-extensions/Makefile.am: One final tweak to get the cdparanoia checks right. --- ChangeLog | 5 +++++ libnautilus-extensions/Makefile.am | 11 ++++++++--- libnautilus-private/Makefile.am | 11 ++++++++--- 3 files changed, 21 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index cade43c6c..3f4b53ecf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2001-03-16 Gene Z. Ragan + + * libnautilus-extensions/Makefile.am: + One final tweak to get the cdparanoia checks right. + 2001-03-16 Gene Z. Ragan * configure.in: diff --git a/libnautilus-extensions/Makefile.am b/libnautilus-extensions/Makefile.am index 6b6365779..c4b4dac52 100644 --- a/libnautilus-extensions/Makefile.am +++ b/libnautilus-extensions/Makefile.am @@ -31,6 +31,12 @@ dependency_static_libs = \ $(top_builddir)/librsvg/librsvg.la \ $(NULL) +if HAVE_CDDA +CDDALIBADD = -lcdda_paranoia -lcdda_interface +else +CDDALIBADD = +endif + libnautilus_extensions_la_LDFLAGS = \ $(dependency_static_libs) \ $(BONOBO_PRINT_LIBS) \ @@ -46,10 +52,9 @@ libnautilus_extensions_la_LDFLAGS = \ $(OAF_LIBS) \ $(VFS_LIBS) \ $(XML_LIBS) \ - -lcdda_paranoia \ - -lcdda_interface \ + $(CDDALIBADD) \ $(NULL) - + nautilus_metafile_server_idl_sources = \ nautilus-metafile-server-stubs.c \ nautilus-metafile-server-skels.c \ diff --git a/libnautilus-private/Makefile.am b/libnautilus-private/Makefile.am index 6b6365779..c4b4dac52 100644 --- a/libnautilus-private/Makefile.am +++ b/libnautilus-private/Makefile.am @@ -31,6 +31,12 @@ dependency_static_libs = \ $(top_builddir)/librsvg/librsvg.la \ $(NULL) +if HAVE_CDDA +CDDALIBADD = -lcdda_paranoia -lcdda_interface +else +CDDALIBADD = +endif + libnautilus_extensions_la_LDFLAGS = \ $(dependency_static_libs) \ $(BONOBO_PRINT_LIBS) \ @@ -46,10 +52,9 @@ libnautilus_extensions_la_LDFLAGS = \ $(OAF_LIBS) \ $(VFS_LIBS) \ $(XML_LIBS) \ - -lcdda_paranoia \ - -lcdda_interface \ + $(CDDALIBADD) \ $(NULL) - + nautilus_metafile_server_idl_sources = \ nautilus-metafile-server-stubs.c \ nautilus-metafile-server-skels.c \ -- cgit v1.2.1