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

configure.ac: make it explicit that --without-cd-paranoia also means

Browse Source 
without the library

If --without-cd-paranoia don't try to build paranoia programs in example and
example/C++.

Thanks to Elio Blanca for reporting the problems.
This commit is contained in:
rocky
2005-09-16 09:31:38 +00:00
parent 2c93030ed7
commit f6a5b4ad0b
3 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
configure.ac
View File

@@ -19,7 +19,7 @@ define(RELEASE_NUM, 76)
define(CDIO_VERSION_STR, 0.$1cvs) define(CDIO_VERSION_STR, 0.$1cvs)
AC_PREREQ(2.52) AC_PREREQ(2.52)
AC_REVISION([$Id: configure.ac,v 1.163 2005/09/15 06:36:01 rocky Exp $])dnl AC_REVISION([$Id: configure.ac,v 1.164 2005/09/16 09:31:38 rocky Exp $])dnl
AC_INIT(libcdio, CDIO_VERSION_STR(RELEASE_NUM)) AC_INIT(libcdio, CDIO_VERSION_STR(RELEASE_NUM))
AC_CONFIG_SRCDIR(src/cd-info.c) AC_CONFIG_SRCDIR(src/cd-info.c)
@@ -50,7 +50,7 @@ AC_ARG_WITH(cd_info,
enable_cd_info="${withval}", enable_cd_info=yes) enable_cd_info="${withval}", enable_cd_info=yes)
AC_ARG_WITH(cd_paranoia, AC_ARG_WITH(cd_paranoia,
[ --without-cd-paranoia don't build program cd-paranoia (default with)], [ --without-cd-paranoia don't build program cd-paranoia and paranoia libraries (default with)],
enable_cd_paranoia="${withval}", enable_cd_paranoia=yes) enable_cd_paranoia="${withval}", enable_cd_paranoia=yes)
AC_ARG_WITH(cdda_player, AC_ARG_WITH(cdda_player,

4
example/C++/Makefile.am
View File

@@ -1,4 +1,4 @@
# $Id: Makefile.am,v 1.3 2005/08/27 14:29:12 rocky Exp $ # $Id: Makefile.am,v 1.4 2005/09/16 09:31:39 rocky Exp $
# #
# Copyright (C) 2005 Rocky Bernstein <rocky@panix.com> # Copyright (C) 2005 Rocky Bernstein <rocky@panix.com>
# #
@@ -27,12 +27,14 @@ INCLUDES = -I$(top_srcdir) $(LIBCDIO_CFLAGS)
device_SOURCES = device.cpp device_SOURCES = device.cpp
device_LDADD = $(LIBCDIO_LIBS) device_LDADD = $(LIBCDIO_LIBS)
if BUILD_CD_PARANOIA
paranoia_SOURCES = paranoia.cpp paranoia_SOURCES = paranoia.cpp
paranoia_LDADD = $(LIBCDIO_PARANOIA_LIBS) $(LIBCDIO_CDDA_LIBS) \ paranoia_LDADD = $(LIBCDIO_PARANOIA_LIBS) $(LIBCDIO_CDDA_LIBS) \
$(LIBCDIO_LIBS) $(LIBCDIO_LIBS)
paranoia2_SOURCES = paranoia.cpp paranoia2_SOURCES = paranoia.cpp
paranoia2_LDADD = $(LIBCDIO_PARANOIA_LIBS) $(LIBCDIO_CDDA_LIBS) \ paranoia2_LDADD = $(LIBCDIO_PARANOIA_LIBS) $(LIBCDIO_CDDA_LIBS) \
$(LIBCDIO_LIBS) $(LIBCDIO_LIBS)
endif
iso1_SOURCES = iso1.cpp iso1_SOURCES = iso1.cpp
iso1_LDADD = $(LIBISO9660_LIBS) $(LIBCDIO_LIBS) $(LIBICONV) iso1_LDADD = $(LIBISO9660_LIBS) $(LIBCDIO_LIBS) $(LIBICONV)

9
example/Makefile.am
View File

@@ -1,4 +1,4 @@
# $Id: Makefile.am,v 1.24 2005/09/15 06:36:01 rocky Exp $ # $Id: Makefile.am,v 1.25 2005/09/16 09:31:39 rocky Exp $
# #
# Copyright (C) 2003, 2004, 2005 Rocky Bernstein <rocky@panix.com> # Copyright (C) 2003, 2004, 2005 Rocky Bernstein <rocky@panix.com>
# #
@@ -23,8 +23,11 @@
if ENABLE_CPP if ENABLE_CPP
SUBDIRS = C++ SUBDIRS = C++
endif endif
if BUILD_CD_PARANOIA
paranoia_progs = paranoia paranoia2
endif
noinst_PROGRAMS = audio cdtext device drives iso1 iso2 iso3 isofuzzy \ noinst_PROGRAMS = audio cdtext device drives iso1 iso2 iso3 isofuzzy \
mmc1 mmc2 paranoia paranoia2 tracks \ mmc1 mmc2 $(paranoia_progs) tracks \
sample3 sample4 sample3 sample4
INCLUDES = -I$(top_srcdir) $(LIBCDIO_CFLAGS) INCLUDES = -I$(top_srcdir) $(LIBCDIO_CFLAGS)
@@ -37,8 +40,10 @@ device_LDADD = $(LIBCDIO_LIBS)
drives_LDADD = $(LIBCDIO_LIBS) drives_LDADD = $(LIBCDIO_LIBS)
if BUILD_CD_PARANOIA
paranoia_LDADD = $(LIBCDIO_PARANOIA_LIBS) $(LIBCDIO_CDDA_LIBS) $(LIBCDIO_LIBS) paranoia_LDADD = $(LIBCDIO_PARANOIA_LIBS) $(LIBCDIO_CDDA_LIBS) $(LIBCDIO_LIBS)
paranoia2_LDADD = $(LIBCDIO_PARANOIA_LIBS) $(LIBCDIO_CDDA_LIBS) $(LIBCDIO_LIBS) paranoia2_LDADD = $(LIBCDIO_PARANOIA_LIBS) $(LIBCDIO_CDDA_LIBS) $(LIBCDIO_LIBS)
endif
iso1_LDADD = $(LIBISO9660_LIBS) $(LIBCDIO_LIBS) $(LIBICONV) iso1_LDADD = $(LIBISO9660_LIBS) $(LIBCDIO_LIBS) $(LIBICONV)
iso2_LDADD = $(LIBISO9660_LIBS) $(LIBCDIO_LIBS) $(LIBICONV) iso2_LDADD = $(LIBISO9660_LIBS) $(LIBCDIO_LIBS) $(LIBICONV)