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

Check for ncurses.h header (in addition to curses.h).

Browse Source 
Had a problem (on Solaris) where both libcurses and libncurses were
around but the curses.h header (from libcurses) was installed.
This commit is contained in:
rocky
2005-03-17 07:36:09 +00:00
parent 20e610a017
commit bd9336310a
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
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.149 2005/03/10 12:47:03 rocky Exp $])dnl AC_REVISION([$Id: configure.ac,v 1.150 2005/03/17 07:36:09 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)
@@ -163,7 +163,7 @@ AC_HEADER_STDC
AC_CHECK_HEADERS(errno.h fcntl.h glob.h pwd.h) AC_CHECK_HEADERS(errno.h fcntl.h glob.h pwd.h)
AC_CHECK_HEADERS(stdarg.h stdbool.h stdio.h sys/cdio.h sys/param.h) AC_CHECK_HEADERS(stdarg.h stdbool.h stdio.h sys/cdio.h sys/param.h)
AC_CHECK_HEADERS(curses.h, [], [enable_cdda_player='no']) AC_CHECK_HEADERS(curses.h ncurses.h, break, [enable_cdda_player='no'])
AC_SUBST(SBPCD_H) AC_SUBST(SBPCD_H)
AC_SUBST(UCDROM_H) AC_SUBST(UCDROM_H)
@@ -507,8 +507,8 @@ fi
AC_SUBST(CDDB_LIBS) AC_SUBST(CDDB_LIBS)
if test x$enable_cdda_player = xyes; then 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_CHECK_LIB(curses, mvprintw, [CDDA_PLAYER_LIBS="$CDDA_PLAYER_LIBS -lcurses"],
AC_CHECK_LIB(ncurses, mvprintw, [CDDA_PLAYER_LIBS="$CDDA_PLAYER_LIBS -lncurses"],
[AC_MSG_WARN([Will not build cdda-player - did not find libcurses or libncurses]) [AC_MSG_WARN([Will not build cdda-player - did not find libcurses or libncurses])
enable_cdda_player=no])) enable_cdda_player=no]))
fi fi

7
src/cdda-player.c
View File

@@ -1,5 +1,5 @@
/* /*
$Id: cdda-player.c,v 1.15 2005/03/16 02:19:20 rocky Exp $ $Id: cdda-player.c,v 1.16 2005/03/17 07:36:10 rocky Exp $
Copyright (C) 2005 Rocky Bernstein <rocky@panix.com> Copyright (C) 2005 Rocky Bernstein <rocky@panix.com>
@@ -57,7 +57,12 @@
#include <errno.h> #include <errno.h>
#endif #endif
#ifdef HAVE_CURSES_H
#include <curses.h> #include <curses.h>
#elif HAVE_NCURSES_H
#include <ncurses.h>
# error "You need <curses.h> or <ncurses.h to build cdda-player"
#endif
#include <cdio/cdio.h> #include <cdio/cdio.h>
#include <cdio/mmc.h> #include <cdio/mmc.h>