[Pcsclite-cvs-commit] r5137 - /trunk/PCSC/configure.in

[rousseau at users.alioth.debian.org]

Author: rousseau
Date: Sun Aug 15 18:43:10 2010
New Revision: 5137

URL: http://svn.debian.org/wsvn/pcsclite/?sc=1&rev=5137
Log:
Do not use sysconfdir as configuration directory but
${sysconfdir}/reader.conf.d instead.

Use --enable-confdir=DIR if you want to set a specific value without the
reader.conf.d appended.

Thanks to Kalev Lember for the bug report
http://archives.neohapsis.com/archives/dev/muscle/2010-q3/0150.html

Modified:
    trunk/PCSC/configure.in

Modified: trunk/PCSC/configure.in
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/configure.in?rev=5137&op=diff
==============================================================================
--- trunk/PCSC/configure.in (original)
+++ trunk/PCSC/configure.in Sun Aug 15 18:43:10 2010
@@ -325,27 +325,23 @@
 	AC_MSG_RESULT([plateform endianess           : little endian])
 fi
 
-# default value of sysconfdir
-if test x"${sysconfdir}" == x'${prefix}/etc'; then
-	# set sysconfdir to /etc instead of /usr/etc if prefix=/usr
-	if test x${prefix} = x/usr; then
-		sysconfdir="/etc"
-	fi
-
-	# add "/reader.conf.d" to the default value
-	sysconfdir="${sysconfdir}/reader.conf.d"
-fi
+# --enable-confdir=DIR
+AC_ARG_ENABLE(confdir,
+AC_HELP_STRING([--enable-confdir=DIR],
+	[directory containing reader configurations (default /etc/reader.conf.d)]),
+	[confdir="${enableval}"],
+	[confdir="${sysconfdir}/reader.conf.d"])
 
 # Setup dist stuff
 AC_SUBST(usbdropdir)
 AC_SUBST(ipcdir)
 AC_SUBST(host_to_ccid_16)
 AC_SUBST(host_to_ccid_32)
-AS_AC_EXPAND(sysconfdir_exp,$sysconfdir)
+AS_AC_EXPAND(confdir_exp,$confdir)
 AS_AC_EXPAND(sbindir_exp,$sbindir)
 AS_AC_EXPAND(localstatedir_exp,$localstatedir)
 
-PCSCLITE_CONFIG_DIR="${sysconfdir_exp}"
+PCSCLITE_CONFIG_DIR="${confdir_exp}"
 AC_SUBST(PCSCLITE_CONFIG_DIR)
 PCSCLITE_FEATURES="${PCSCLITE_FEATURES} configdir=${PCSCLITE_CONFIG_DIR}"
 AC_DEFINE_UNQUOTED([PCSCLITE_FEATURES], ["${PCSCLITE_FEATURES}"], [Enabled PC/SC lite features])