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

Check for libncurses as well as libcurses and add whatever is found to

Browse Source 
cdda-player libraries.
This commit is contained in:
rocky
2005-03-10 12:47:03 +00:00
parent ff7b7cbfa6
commit fb00a8ab56
2 changed files with 55 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
configure.ac
View File

@@ -19,7 +19,7 @@ define(RELEASE_NUM, 73)
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.148 2005/03/09 03:39:46 rocky Exp $])dnl AC_REVISION([$Id: configure.ac,v 1.149 2005/03/10 12:47:03 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)
@@ -506,6 +506,15 @@ fi
AC_SUBST(CDDB_LIBS) AC_SUBST(CDDB_LIBS)
if test x$enable_cdda_player = xyes; then
AC_CHECK_LIB(ncurses, mvprintw, [CDDA_PLAYER_LIBS="$CDDA_PLAYER_LIBS -lncurses"],
AC_CHECK_LIB(curses, mvprintw, [CDDA_PLAYER_LIBS="$CDDA_PLAYER_LIBS -lcurses"],
[AC_MSG_WARN([Will not build cdda-player - did not find libcurses or libncurses])
enable_cdda_player=no]))
fi
AC_SUBST(CDDA_PLAYER_LIBS)
if test x$enable_vcd_info = x; then if test x$enable_vcd_info = x; then
AC_ARG_ENABLE(vcd_info, AC_ARG_ENABLE(vcd_info,
[ --disable-vcd-info don't include Video CD Info from libvcd], [ --disable-vcd-info don't include Video CD Info from libvcd],
@@ -583,3 +592,45 @@ chmod +x test/check_paranoia.sh
AC_OUTPUT AC_OUTPUT
echo "Using CD-ROM drivers: $cd_drivers" echo "Using CD-ROM drivers: $cd_drivers"
echo -n "Building cd-paranoia: "
if test "x$enable_cdda_player" = "xyes"
then
echo "yes"
else
echo "no"
fi
echo -n "Building cd-info : "
if test "x$enable_cd_info" = "xyes"
then
echo "yes"
else
echo "no"
fi
echo -n "Building cd-read : "
if test "x$enable_cd_read" = "xyes"
then
echo "yes"
else
echo "no"
fi
echo -n "Building cdda-player: "
if test "x$enable_cdda_player" = "xyes"
then
echo "yes"
else
echo "no"
fi
echo -n "Building iso-info : "
if test "x$enable_iso_info" = "xyes"
then
echo "yes"
else
echo "no"
fi
echo -n "Building iso-read : "
if test "x$enable_iso_read" = "xyes"
then
echo "yes"
else
echo "no"
fi

5
src/Makefile.am
View File

@@ -1,4 +1,4 @@
# $Id: Makefile.am,v 1.34 2005/03/07 12:55:12 rocky Exp $ # $Id: Makefile.am,v 1.35 2005/03/10 12:47:03 rocky Exp $
# #
# Copyright (C) 2003, 2004, 2005 Rocky Bernstein <rocky@panix.com> # Copyright (C) 2003, 2004, 2005 Rocky Bernstein <rocky@panix.com>
# #
@@ -25,6 +25,7 @@ SUBDIRS = cd-paranoia
endif endif
CDDB_LIBS=@CDDB_LIBS@ CDDB_LIBS=@CDDB_LIBS@
CDDA_PLAYER_LIBS=@CDDA_PLAYER_LIBS@
if MAINTAINER_MODE if MAINTAINER_MODE
MAINTAINERCLEANFILES = $(man_MANS) MAINTAINERCLEANFILES = $(man_MANS)
@@ -35,7 +36,7 @@ endif
if BUILD_CDDA_PLAYER if BUILD_CDDA_PLAYER
cdda_player_SOURCES = cdda-player.c cddb.c cddb.h cdda_player_SOURCES = cdda-player.c cddb.c cddb.h
cdda_player_LDADD = $(LIBCDIO_LIBS) $(CDDB_LIBS) -lcurses cdda_player_LDADD = $(LIBCDIO_LIBS) $(CDDB_LIBS) $(CDDA_PLAYER_LIBS)
bin_cdda_player = cdda-player bin_cdda_player = cdda-player
endif endif