[Pcsclite-cvs-commit] r2946 - in /trunk/PCSC: configure.in src/pcscdaemon.c

[rousseau at users.alioth.debian.org]

Author: rousseau
Date: Tue May 13 07:32:48 2008
New Revision: 2946

URL: http://svn.debian.org/wsvn/pcsclite/?sc=1&rev=2946
Log:
pcscd -v now displays the enabled features

Thanks to Alon Bar-Lev for the suggestion

Modified:
    trunk/PCSC/configure.in
    trunk/PCSC/src/pcscdaemon.c

Modified: trunk/PCSC/configure.in
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/configure.in?rev=2946&op=diff
==============================================================================
--- trunk/PCSC/configure.in (original)
+++ trunk/PCSC/configure.in Tue May 13 07:32:48 2008
@@ -132,6 +132,7 @@
 	;;
 esac
 AC_DEFINE_UNQUOTED(PCSC_ARCH, "$PCSC_ARCH", [PC/SC target architecture])
+PCSCLITE_FEATURES="${PCSCLITE_FEATURES} $PCSC_ARCH"
 
 # See if socket() is found from libsocket
 AC_CHECK_LIB(socket, socket, [LIBS="$LIBS -lsocket"])
@@ -172,6 +173,7 @@
 
 if test x$use_libhal = xyes; then
   AC_DEFINE(HAVE_LIBHAL, 1, [Libhal is available])
+  PCSCLITE_FEATURES="${PCSCLITE_FEATURES} libhal"
 fi
 
 # --enable-libusb
@@ -230,6 +232,7 @@
 
 if test x$use_libusb = xyes; then
   AC_DEFINE(HAVE_LIBUSB, 1, [Libusb is available])
+  PCSCLITE_FEATURES="${PCSCLITE_FEATURES} libusb"
 fi
 
 # --enable-usbdropdir=DIR
@@ -245,6 +248,7 @@
 	fi
 fi
 AC_DEFINE_UNQUOTED(PCSCLITE_HP_DROPDIR, "$usbdropdir", [directory containing USB drivers])
+PCSCLITE_FEATURES="${PCSCLITE_FEATURES} usbdropdir=${usbdropdir}"
 
 # --enable-debugatr
 AC_ARG_ENABLE(debugatr,
@@ -257,6 +261,7 @@
 
 if test x${debugatr} = xtrue ; then
   AC_DEFINE(ATR_DEBUG, 1, [display ATR parsing debug messages.])
+  PCSCLITE_FEATURES="${PCSCLITE_FEATURES} debugatr"
 fi
 
 # --enable-scf
@@ -284,6 +289,7 @@
 if test x${confdir} = xfalse ; then
 	confdir="/etc"
 fi
+PCSCLITE_FEATURES="${PCSCLITE_FEATURES} confdir=${confdir}"
 
 # --enable-ipcdir=DIR
 AC_ARG_ENABLE(ipcdir,
@@ -295,6 +301,7 @@
 	ipcdir="/var/run/pcscd"
 fi
 AC_DEFINE_UNQUOTED(USE_IPCDIR, "$ipcdir", [directory containing IPC files])
+PCSCLITE_FEATURES="${PCSCLITE_FEATURES} ipcdir=${ipcdir}"
 
 CPPFLAGS="-I\${top_srcdir}/src $CPPFLAGS"
 
@@ -319,6 +326,8 @@
 AS_AC_EXPAND(sysconfdir_exp,$sysconfdir)
 AS_AC_EXPAND(sbindir_exp,$sbindir)
 AS_AC_EXPAND(localstatedir_exp,$localstatedir)
+
+AC_DEFINE_UNQUOTED([PCSCLITE_FEATURES], ["${PCSCLITE_FEATURES}"], [Enabled PC/SC lite features])
 
 cat << EOF
 

Modified: trunk/PCSC/src/pcscdaemon.c
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/pcscdaemon.c?rev=2946&op=diff
==============================================================================
--- trunk/PCSC/src/pcscdaemon.c (original)
+++ trunk/PCSC/src/pcscdaemon.c Tue May 13 07:32:48 2008
@@ -576,6 +576,8 @@
 	printf("Copyright (C) 2001-2008 by Ludovic Rousseau <ludovic.rousseau at free.fr>.\n");
 	printf("Copyright (C) 2003-2004 by Damien Sauveron <sauveron at labri.fr>.\n");
 	printf("Report bugs to <muscle at lists.musclecard.com>.\n");
+
+	printf ("Enabled features:%s\n", PCSCLITE_FEATURES);
 }
 
 void print_usage (char const * const progname)