[Pcsclite-cvs-commit] r4708 - in /trunk/PCSC: configure.in src/pcscd.h.in

[rousseau at users.alioth.debian.org]

Author: rousseau
Date: Wed Feb  3 10:29:32 2010
New Revision: 4708

URL: http://svn.debian.org/wsvn/pcsclite/?sc=1&rev=4708
Log:
Use the standard --sysconfdir=DIR ($prefix/etc by default) instead of
--enable-confdir=DIR for defining the directory containing reader.conf

Modified:
    trunk/PCSC/configure.in
    trunk/PCSC/src/pcscd.h.in

Modified: trunk/PCSC/configure.in
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/configure.in?rev=4708&op=diff
==============================================================================
--- trunk/PCSC/configure.in (original)
+++ trunk/PCSC/configure.in Wed Feb  3 10:29:32 2010
@@ -266,15 +266,6 @@
   PCSCLITE_FEATURES="${PCSCLITE_FEATURES} debugatr"
 fi
 
-# --enable-confdir=DIR
-AC_ARG_ENABLE(confdir,
-AC_HELP_STRING([--enable-confdir=DIR],[directory containing reader.conf
-				(default /etc)]),
-[confdir="${enableval}"], [confdir=false])
-if test x${confdir} = xfalse ; then
-	confdir="/etc"
-fi
-PCSCLITE_FEATURES="${PCSCLITE_FEATURES} confdir=${confdir}"
 
 # --enable-ipcdir=DIR
 AC_ARG_ENABLE(ipcdir,
@@ -303,15 +294,14 @@
 
 # Setup dist stuff
 AC_SUBST(usbdropdir)
-AC_SUBST(confdir)
 AC_SUBST(ipcdir)
 AC_SUBST(host_to_ccid_16)
 AC_SUBST(host_to_ccid_32)
-AS_AC_EXPAND(confdir_exp,$confdir)
 AS_AC_EXPAND(sysconfdir_exp,$sysconfdir)
 AS_AC_EXPAND(sbindir_exp,$sbindir)
 AS_AC_EXPAND(localstatedir_exp,$localstatedir)
 
+PCSCLITE_FEATURES="${PCSCLITE_FEATURES} sysconfdir=${sysconfdir_exp}"
 AC_DEFINE_UNQUOTED([PCSCLITE_FEATURES], ["${PCSCLITE_FEATURES}"], [Enabled PC/SC lite features])
 PCSCD_BINARY="${sbindir_exp}/pcscd"
 AC_DEFINE_UNQUOTED([PCSCD_BINARY], ["$PCSCD_BINARY"], [pcscd filename])
@@ -342,7 +332,6 @@
 libusb support:       ${use_libusb}
 USB drop directory:   ${usbdropdir}
 ATR parsing messages: ${debugatr}
-confdir:              ${confdir}
 ipcdir:               ${ipcdir}
 
 EOF

Modified: trunk/PCSC/src/pcscd.h.in
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/pcscd.h.in?rev=4708&op=diff
==============================================================================
--- trunk/PCSC/src/pcscd.h.in (original)
+++ trunk/PCSC/src/pcscd.h.in Wed Feb  3 10:29:32 2010
@@ -23,7 +23,7 @@
 #define SCARD_INSERTED			0x0002	/**< Card was inserted */
 #define SCARD_REMOVED			0x0004	/**< Card was removed */
 
-#define PCSCLITE_CONFIG_DIR		"@confdir_exp@"
+#define PCSCLITE_CONFIG_DIR		"@sysconfdir_exp@"
 
 #define PCSCLITE_IPC_DIR		USE_IPCDIR
 #define PCSCLITE_RUN_PID		PCSCLITE_IPC_DIR "/pcscd.pid"