[Pcsclite-cvs-commit] r2506 - trunk/PCSC

[Ludovic Rousseau]

Author: rousseau
Date: 2007-04-21 13:48:05 +0000 (Sat, 21 Apr 2007)
New Revision: 2506

Modified:
   trunk/PCSC/configure.in
Log:
use $ipcdir/pcscd.pid as the default value for so that the use of
--enable-runpid=FILE is not mandatory


Modified: trunk/PCSC/configure.in
===================================================================
--- trunk/PCSC/configure.in	2007-04-12 09:41:13 UTC (rev 2505)
+++ trunk/PCSC/configure.in	2007-04-21 13:48:05 UTC (rev 2506)
@@ -252,35 +252,33 @@
 	AC_MSG_RESULT([enable confdir                : /etc (default)])
 fi
 
+# --enable-ipcdir=DIR
+AC_ARG_ENABLE(ipcdir,
+  AC_HELP_STRING([--enable-ipcdir=DIR],[directory containing IPC files
+				  (default /var/run)]),
+[ipcdir="${enableval}"], [ipcdir=false])
+
+if test x${ipcdir} = xfalse ; then
+	ipcdir="/var/run"
+fi
+AC_DEFINE_UNQUOTED(USE_IPCDIR, "$ipcdir", [directory containing IPC files])
+AC_MSG_RESULT([enable ipcdir                 : $ipcdir])
+
 # --enable-runpid=FILE
 AC_ARG_ENABLE(runpid,
   AC_HELP_STRING([--enable-runpid=FILE],[file containing pcscd pid]),
-[runpid="${enableval}"], [AC_ERROR([use of --enable-runpid=FILE is mandatory])])
+[runpid="${enableval}"], [runpid=false])
 
-AC_MSG_RESULT([enable runpid                 : $runpid])
-
 # HAVE_RUNPID is for pcscd.8
 if test x${runpid} != xfalse ; then
-	AC_DEFINE_UNQUOTED(USE_RUN_PID, "$runpid", [file containing pcscd pid])
 	AC_SUBST(HAVE_RUNPID,'')
 else
+	runpid="$ipcdir/pcscd.pid"
 	AC_SUBST(HAVE_RUNPID,'.\" ')
 fi
+AC_DEFINE_UNQUOTED(USE_RUN_PID, "$runpid", [file containing pcscd pid])
+AC_MSG_RESULT([enable runpid                 : $runpid])
 
-# --enable-ipcdir=DIR
-AC_ARG_ENABLE(ipcdir,
-  AC_HELP_STRING([--enable-ipcdir=DIR],[directory containing IPC files
-				  (default /var/run)]),
-[ipcdir="${enableval}"], [ipcdir=false])
-
-if test x${ipcdir} != xfalse ; then
-	AC_MSG_RESULT([enable ipcdir                 : $ipcdir])
-
-	AC_DEFINE_UNQUOTED(USE_IPCDIR, "$ipcdir", [directory containing IPC files (default /var/run)])
-else
-	AC_MSG_RESULT([enable ipcdir                 : /var/run (default)])
-fi
-
 CPPFLAGS="-I\${top_srcdir}/src $CPPFLAGS"
 
 # HOST_TO_CCID