ability to link against ncursesw if ncurses is not found

This commit is contained in:
Frederic Culot 2009-01-23 21:09:21 +00:00
parent 08aaf496fc
commit 9abf70b4a6
3 changed files with 42 additions and 4 deletions

View File

@ -1,8 +1,8 @@
/* $calcurse: calendar.h,v 1.12 2008/08/10 09:24:46 culot Exp $ */
/* $calcurse: calendar.h,v 1.13 2009/01/23 21:09:21 culot Exp $ */
/*
* Calcurse - text-based organizer
* Copyright (c) 2004-2008 Frederic Culot
* Copyright (c) 2004-2009 Frederic Culot
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -27,7 +27,20 @@
#ifndef CALCURSE_CALENDAR_H
#define CALCURSE_CALENDAR_H
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif /* HAVE_CONFIG_H */
#ifdef HAVE_NCURSES_H
#include <ncurses.h>
#elif defined HAVE_NCURSES_NCURSES_H
#include <ncurses/ncurses.h>
#elif defined HAVE_NCURSESW_NCURSES_H
#include <ncursesw/ncurses.h>
#else
#error "Missing ncurses header. Aborting..."
#endif
#include <stdbool.h>
#include <time.h>

View File

@ -1,4 +1,4 @@
/* $calcurse: keys.h,v 1.9 2009/01/03 21:32:11 culot Exp $ */
/* $calcurse: keys.h,v 1.10 2009/01/23 21:09:21 culot Exp $ */
/*
* Calcurse - text-based organizer
@ -27,7 +27,19 @@
#ifndef CALCURSE_KEYS_H
#define CALCURSE_KEYS_H
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif /* HAVE_CONFIG_H */
#ifdef HAVE_NCURSES_H
#include <ncurses.h>
#elif defined HAVE_NCURSES_NCURSES_H
#include <ncurses/ncurses.h>
#elif defined HAVE_NCURSESW_NCURSES_H
#include <ncursesw/ncurses.h>
#else
#error "Missing ncurses header. Aborting..."
#endif
#define CTRLVAL 0x1F
#define CTRL(x) ((x) & CTRLVAL)

View File

@ -1,4 +1,4 @@
/* $calcurse: vars.h,v 1.30 2009/01/05 20:12:08 culot Exp $ */
/* $calcurse: vars.h,v 1.31 2009/01/23 21:09:21 culot Exp $ */
/*
* Calcurse - text-based organizer
@ -27,7 +27,20 @@
#ifndef CALCURSE_VARS_H
#define CALCURSE_VARS_H
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif /* HAVE_CONFIG_H */
#ifdef HAVE_NCURSES_H
#include <ncurses.h>
#elif defined HAVE_NCURSES_NCURSES_H
#include <ncurses/ncurses.h>
#elif defined HAVE_NCURSESW_NCURSES_H
#include <ncursesw/ncurses.h>
#else
#error "Missing ncurses header. Aborting..."
#endif
#include <pthread.h>
#include <stdbool.h>