diff options
| author | Gene Z. Ragan <gzr@eazel.com> | 2001-03-17 05:03:50 +0000 |
|---|---|---|
| committer | Gene Ragan <gzr@src.gnome.org> | 2001-03-17 05:03:50 +0000 |
| commit | 0ccfd189e1039b4049576afd249dce1b563d9da0 (patch) | |
| tree | 19288249547d58f38581010303f87db85cc21d84 | |
| parent | 556468e3e5812b2ddee611b45291e9e186bdfe90 (diff) | |
| download | nautilus-0ccfd189e1039b4049576afd249dce1b563d9da0.tar.gz | |
One final tweak to get the cdparanoia checks right.
2001-03-16 Gene Z. Ragan <gzr@eazel.com>
* libnautilus-extensions/Makefile.am:
One final tweak to get the cdparanoia checks right.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | libnautilus-extensions/Makefile.am | 11 | ||||
| -rw-r--r-- | libnautilus-private/Makefile.am | 11 |
3 files changed, 21 insertions, 6 deletions
@@ -1,5 +1,10 @@ 2001-03-16 Gene Z. Ragan <gzr@eazel.com> + * libnautilus-extensions/Makefile.am: + One final tweak to get the cdparanoia checks right. + +2001-03-16 Gene Z. Ragan <gzr@eazel.com> + * configure.in: * libnautilus-extensions/Makefile.am: Add checks for cdparanoia to allow enabling of 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 \ |