Fix build with CMake

- Fix library finding ('nfc' instead of 'libnfc');
- Generate config.h from template on non-win32 platforms;
- While here, include protection for config.h in several files.
This commit is contained in:
Stefan Walkner 2017-04-12 13:45:33 +02:00 committed by Romain Tartière
parent 358df7759a
commit 565ee18b8e
25 changed files with 94 additions and 24 deletions

View file

@ -15,7 +15,9 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>
*/
#include "config.h"
#if defined(HAVE_CONFIG_H)
# include "config.h"
#endif
#include <ctype.h>
#include <err.h>

View file

@ -16,7 +16,9 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>
*/
#include "config.h"
#if defined(HAVE_CONFIG_H)
# include "config.h"
#endif
#include <err.h>
#include <errno.h>

View file

@ -30,7 +30,9 @@
* Document Identifier 130410
*/
#include "config.h"
#if defined(HAVE_CONFIG_H)
# include "config.h"
#endif
#include <err.h>
#include <errno.h>

View file

@ -15,7 +15,9 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>
*/
#include "config.h"
#if defined(HAVE_CONFIG_H)
# include "config.h"
#endif
#include <err.h>
#include <errno.h>

View file

@ -15,7 +15,9 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>
*/
#include "config.h"
#if defined(HAVE_CONFIG_H)
# include "config.h"
#endif
#include <err.h>
#include <stdlib.h>

View file

@ -15,7 +15,9 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>
*/
#include "config.h"
#if defined(HAVE_CONFIG_H)
# include "config.h"
#endif
#include <err.h>
#include <errno.h>

View file

@ -15,7 +15,9 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>
*/
#include "config.h"
#if defined(HAVE_CONFIG_H)
# include "config.h"
#endif
#include <err.h>
#include <errno.h>

View file

@ -15,7 +15,9 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>
*/
#include "config.h"
#if defined(HAVE_CONFIG_H)
# include "config.h"
#endif
#include <err.h>
#include <errno.h>

View file

@ -15,7 +15,9 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>
*/
#include "config.h"
#if defined(HAVE_CONFIG_H)
# include "config.h"
#endif
#include <err.h>
#include <errno.h>

View file

@ -15,7 +15,9 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>
*/
#include "config.h"
#if defined(HAVE_CONFIG_H)
# include "config.h"
#endif
#include <err.h>
#include <stdlib.h>

View file

@ -15,7 +15,9 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>
*/
#include "config.h"
#if defined(HAVE_CONFIG_H)
# include "config.h"
#endif
#include <err.h>
#include <stdlib.h>