forked/libnfc
1
0
Fork 0
mirror of https://github.com/nfc-tools/libnfc.git synced 2026-04-26 00:16:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge libnfc-1.5-new-api branch to trunk (r1168:1303).

Browse Source
This commit is contained in:
Audrey Diacre
2012-01-25 09:56:05 +00:00
parent 2d393bff91 1f3b995c2a
commit 26245add73
82 changed files with 4481 additions and 3212 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
configure.ac
View File

@@ -70,17 +70,6 @@ AC_TYPE_SIGNAL
LIBNFC_CFLAGS='-I$(top_srcdir)/libnfc -I$(top_builddir)/include -I$(top_srcdir)/include'
AC_SUBST(LIBNFC_CFLAGS)
# Checks for log4c
AC_PATH_PROG([LOG4C_CONFIG], [log4c-config])
if test x"$LOG4C_CONFIG" != x""; then
log4c_CFLAGS=`$LOG4C_CONFIG --cflags`
log4c_LIBS=`$LOG4C_CONFIG --libs`
AC_SUBST([log4c_CFLAGS])
AC_SUBST([log4c_LIBS])
AC_DEFINE([HAS_LOG4C], [1], [Define to 1 if log4c is available.])
fi
AM_CONDITIONAL(HAS_LOG4C, [test x"$LOG4C_CONFIG" != x""])
# Debug support (default:no)
AC_ARG_ENABLE([debug],AS_HELP_STRING([--enable-debug],[Enable debug output]),[enable_debug=$enableval],[enable_debug="no"])
@@ -155,6 +144,8 @@ AC_CONFIG_FILES([
cmake/Makefile
cmake/modules/Makefile
contrib/Makefile
contrib/devd/Makefile
contrib/udev/Makefile
contrib/win32/Makefile
contrib/win32/sys/Makefile
examples/Makefile