Index: configure.ac
==================================================================
--- configure.ac
+++ configure.ac
@@ -143,12 +143,18 @@
 	]
 )
 
 dnl Option to enable DoD certs on hardware slot
 AC_ARG_ENABLE(dod-certs-on-hw-slots, AC_HELP_STRING([--enable-dod-certs-on-hw-slots], [Specify that DoD certificates should be made available on hardware token slots]), [
-	AC_DEFINE(CACKEY_CARD_SLOT_INCLUDE_EXTRA_CERTS, [1], [Specify that DoD certificates should be made available on hardware token slots])
+	dodcertsonhwslots=$enableval
+], [
+	dodcertsonhwslots=no
 ])
+
+if ! test "${dodcertsonhwslots}" = 'no'; then
+	AC_DEFINE(CACKEY_CARD_SLOT_INCLUDE_EXTRA_CERTS, [1], [Specify that DoD certificates should be made available on hardware token slots])
+fi
 
 dnl Set version script, to limit the scope of symbols
 DC_SETVERSIONSCRIPT(libcackey.vers, libcackey.syms)
 
 dnl Upate LDFLAGS to include setting the run-time linker path to the same as our compile-time linker