crewID/libnfc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

- Fix missing checks reported by autoscan (we still do nothing on failure but at least the configure output might be more useful in case of problem);

Browse source 
- Lint configure output when libusb detection methods fallback over and over.
This commit is contained in:
Romain Tartiere 2010-09-07 09:01:59 +00:00
parent ec58634a67
commit 9629d073cb
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
configure.ac
View file

@ -34,12 +34,15 @@ AC_PATH_PROG(PKG_CONFIG, pkg-config, [AC_MSG_ERROR([pkg-config not found.])])
# Checks for header files. # Checks for header files.
AC_HEADER_STDC AC_HEADER_STDC
AC_HEADER_STDBOOL AC_HEADER_STDBOOL
AC_CHECK_HEADERS([stdio.h stdlib.h stdint.h stddef.h stdbool.h]) AC_CHECK_HEADERS([fcntl.h limits.h stdio.h stdlib.h stdint.h stddef.h stdbool.h sys/ioctl.h sys/param.h sys/time.h termios.h])
AC_CHECK_FUNCS([strdup, usleep], [AC_DEFINE([_XOPEN_SOURCE], [600], [Enable POSIX extensions if present])]) AC_CHECK_FUNCS([bzero memmove memset select strdup strerror strstr strtol usleep],
[AC_DEFINE([_XOPEN_SOURCE], [600], [Enable POSIX extensions if present])])
AC_DEFINE(_NETBSD_SOURCE, 1, [Define on NetBSD to activate all library features]) AC_DEFINE(_NETBSD_SOURCE, 1, [Define on NetBSD to activate all library features])
AC_DEFINE(_DARWIN_C_SOURCE, 1, [Define on Darwin to activate all library features]) AC_DEFINE(_DARWIN_C_SOURCE, 1, [Define on Darwin to activate all library features])
AC_FUNC_MALLOC
# Checks for types # Checks for types
AC_TYPE_SIZE_T AC_TYPE_SIZE_T
AC_TYPE_UINT8_T AC_TYPE_UINT8_T
@ -48,6 +51,8 @@ AC_TYPE_UINT32_T
AC_TYPE_UINT64_T AC_TYPE_UINT64_T
AC_TYPE_INT32_T AC_TYPE_INT32_T
AC_TYPE_SIGNAL
LIBNFC_CFLAGS='-I$(top_srcdir)/libnfc -I$(top_builddir)/include -I$(top_srcdir)/include' LIBNFC_CFLAGS='-I$(top_srcdir)/libnfc -I$(top_builddir)/include -I$(top_srcdir)/include'
AC_SUBST(LIBNFC_CFLAGS) AC_SUBST(LIBNFC_CFLAGS)

5
m4/libnfc_check_libusb.m4
View file

@ -18,8 +18,6 @@ AC_DEFUN([LIBNFC_CHECK_LIBUSB],
fi fi
fi fi
AC_MSG_CHECKING(for libusb)
# Search using libusb-config # Search using libusb-config
if test x"$HAVE_LIBUSB" = "x0"; then if test x"$HAVE_LIBUSB" = "x0"; then
AC_PATH_PROG(libusb_CONFIG,libusb-config) AC_PATH_PROG(libusb_CONFIG,libusb-config)
@ -40,10 +38,7 @@ AC_DEFUN([LIBNFC_CHECK_LIBUSB],
fi fi
if test x"$HAVE_LIBUSB" = "x0"; then if test x"$HAVE_LIBUSB" = "x0"; then
AC_MSG_RESULT(no)
AC_MSG_ERROR([libusb is mandatory.]) AC_MSG_ERROR([libusb is mandatory.])
else
AC_MSG_RESULT(yes)
fi fi
AC_SUBST(libusb_LIBS) AC_SUBST(libusb_LIBS)