Reuse ipcdir in src/pcscd.h.in

This avoids an indirection and simplify the setup in meson(1).
LudovicRousseau · Apr 24, 2024 · 88007cf · 88007cf
1 parent 2258a40
commit 88007cf
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/configure.ac b/configure.ac
@@ -341,7 +341,6 @@ AC_ARG_ENABLE(ipcdir,
 [ipcdir="${enableval}"], [ipcdir=false])
 
 AS_IF([test x${ipcdir} = xfalse], [ipcdir="/run/pcscd"])
-AC_DEFINE_UNQUOTED(USE_IPCDIR, "$ipcdir", [directory containing IPC files])
 PCSCLITE_FEATURES="${PCSCLITE_FEATURES} ipcdir=${ipcdir}"
 
 CPPFLAGS="-I\${top_srcdir}/src $CPPFLAGS"

diff --git a/src/pcscd.h.in b/src/pcscd.h.in
@@ -44,7 +44,7 @@
 
 #define PCSCLITE_CONFIG_DIR "@PCSCLITE_CONFIG_DIR@"
 
-#define PCSCLITE_IPC_DIR USE_IPCDIR
+#define PCSCLITE_IPC_DIR "@ipcdir@"
 #define PCSCLITE_RUN_PID PCSCLITE_IPC_DIR "/pcscd.pid"
 
 #define PCSCLITE_CSOCK_NAME PCSCLITE_IPC_DIR "/pcscd.comm"