From 1cdeded8311e24828831e7dbb4c9f8d3981528c7 Mon Sep 17 00:00:00 2001 From: Alessio Di Mauro Date: Fri, 6 Nov 2015 15:56:13 +0100 Subject: [PATCH] YKCS11: turn off debug by default and make it a configure option (--enable-ykcs11-debug). --- configure.ac | 14 ++++++++++++++ ykcs11/debug.h | 3 --- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index f51533e..a291019 100644 --- a/configure.ac +++ b/configure.ac @@ -182,6 +182,19 @@ if test "$gl_gcc_warnings" = yes; then gl_WARN_ADD([-fdiagnostics-show-option]) fi +AC_ARG_ENABLE([ykcs11-debug], + [AS_HELP_STRING([--enable-ykcs11-debug], + [enables YKCS11 debug messages])], + [enable_ykcs11_debug="$enableval"], + [enable_ykcs11_debug="no"]) + +AS_IF([test "x$enable_ykcs11_debug" != xno], + [AC_DEFINE([YKCS11_DBG], [1], [Regular debug flag]) + AC_DEFINE([YKCS11_DINOUT], [1], [Function accessed/left debug flag])], + [true], + [AC_DEFINE([YKCS11_DBG], [0], [Regular debug flag]) + AC_DEFINE([YKCS11_DINOUT], [0], [Function accessed/left debug flag])]) + AC_SUBST(YKPIV_VERSION_MAJOR, `echo $PACKAGE_VERSION | sed 's/\(.*\)\..*\..*/\1/g'`) AC_SUBST(YKPIV_VERSION_MINOR, `echo $PACKAGE_VERSION | sed 's/.*\.\(.*\)\..*/\1/g'`) AC_SUBST(YKPIV_VERSION_PATCH, `echo $PACKAGE_VERSION | sed 's/.*\..*\.\(.*\)/\1/g'`) @@ -223,4 +236,5 @@ AC_MSG_NOTICE([summary of build options: LIBS: ${PCSC_WIN_LIBS} Mac PCSC LIBS: ${PCSC_MACOSX_LIBS} + ]) diff --git a/ykcs11/debug.h b/ykcs11/debug.h index 84ab9ce..ec475c9 100644 --- a/ykcs11/debug.h +++ b/ykcs11/debug.h @@ -1,9 +1,6 @@ #ifndef DEBUG_H #define DEBUG_H -#define YKCS11_DBG 1 // General debug, must be either 1 or 0 -#define YKCS11_DINOUT 1 // Function in/out debug, must be either 1 or 0 - #define D(x...) do { \ fprintf (stderr, "debug: %s:%d (%s): ", __FILE__, __LINE__, __FUNCTION__); \ fprintf (stderr, x); \