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

Fix "Requires: " section in pkg-config file when libusb or libpcsclite were disabled.

Browse source
This commit is contained in:
Romuald Conty 2009-09-10 13:18:51 +00:00
parent 6634d185bb
commit e2dc2c133a
2 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
configure.ac
View file

@ -80,6 +80,8 @@ then
fi fi
AM_CONDITIONAL(LIBUSB_ENABLED, [test x"$enable_libusb" = xyes]) AM_CONDITIONAL(LIBUSB_ENABLED, [test x"$enable_libusb" = xyes])
# Dependencies
PKG_CONFIG_REQUIRES=""
## libusb ## libusb
if test "x$enable_libusb" = "xyes"; then if test "x$enable_libusb" = "xyes"; then
if test x"$PKG_CONFIG" = "x"; then if test x"$PKG_CONFIG" = "x"; then
@ -93,6 +95,10 @@ if test "x$enable_libusb" = "xyes"; then
fi fi
else else
PKG_CHECK_MODULES(LIBUSB, libusb, [WITH_USB=1], [WITH_USB=0]) PKG_CHECK_MODULES(LIBUSB, libusb, [WITH_USB=1], [WITH_USB=0])
if test x"$PKG_CONFIG_REQUIRES" != x""; then
PKG_CONFIG_REQUIRES="$PKG_CONFIG_REQUIRES,"
fi
PKG_CONFIG_REQUIRES="$PKG_CONFIG_REQUIRES libusb"
fi fi
if test x"$WITH_USB" = "x0"; then if test x"$WITH_USB" = "x0"; then
@ -115,12 +121,18 @@ if test "x$enable_pcsc_lite" = "xyes"; then
if test x"$WITH_PCSC" = "x0" ; then if test x"$WITH_PCSC" = "x0" ; then
AC_MSG_ERROR([libpcsclite is mandatory.]) AC_MSG_ERROR([libpcsclite is mandatory.])
fi fi
if test x"$PKG_CONFIG_REQUIRES" != x""; then
PKG_CONFIG_REQUIRES="$PKG_CONFIG_REQUIRES,"
fi
PKG_CONFIG_REQUIRES="$PKG_CONFIG_REQUIRES libpcsclite"
;; ;;
esac esac
AC_SUBST(LIBPCSCLITE_LIBS) AC_SUBST(LIBPCSCLITE_LIBS)
AC_SUBST(LIBPCSCLITE_CFLAGS) AC_SUBST(LIBPCSCLITE_CFLAGS)
fi fi
AC_SUBST(PKG_CONFIG_REQUIRES)
# Set C standard to C99 # Set C standard to C99
# C99 standard support (default: yes) # C99 standard support (default: yes)
AC_ARG_ENABLE([std-c99],AS_HELP_STRING([--disable-std-c99],[Disable C99 standard when compiling]),[enable_std_c99=$enableval],[enable_std_c99="yes"]) AC_ARG_ENABLE([std-c99],AS_HELP_STRING([--disable-std-c99],[Disable C99 standard when compiling]),[enable_std_c99=$enableval],[enable_std_c99="yes"])

2
libnfc.pc.in
View file

@ -5,6 +5,6 @@ includedir=@includedir@/@PACKAGE@
Name: libnfc Name: libnfc
Description: Near Field Communication (NFC) library Description: Near Field Communication (NFC) library
Version: @VERSION@ Version: @VERSION@
Requires: libusb, libpcsclite Requires: @PKG_CONFIG_REQUIRES@
Libs: -L${libdir} -lnfc Libs: -L${libdir} -lnfc
Cflags: -I${includedir} Cflags: -I${includedir}