---
configure.in | 52 ++++++++++++++++++----------------------------------
1 files changed, 18 insertions(+), 34 deletions(-)
diff --git a/configure.in b/configure.in
index 7c04633..a84010e 100644
--- a/configure.in
+++ b/configure.in
@@ -19,30 +19,6 @@ dnl ---
dnl --- Check all --enable/--disable-features
dnl ---
-dnl --- Debugging support
-AC_ARG_ENABLE([debug],
- AS_HELP_STRING([--enable-debug],[enable debugging build
@<:@default=no@:>@]),
- [],
- [enable_debug=no])
-
-dnl --- build testcases
-AC_ARG_ENABLE([testcases],
- AS_HELP_STRING([--enable-testcases],[build the test cases
@<:@default=no@:>@]),
- [],
- [enable_testcases=no])
-
-dnl --- Check if building daemon
-AC_ARG_ENABLE([daemon],
- AS_HELP_STRING([--enable-daemon],[build pkcsslotd daemon
@<:@default=yes@:>@]),
- [],
- [enable_daemon=yes])
-
-dnl --- Check if building library
-AC_ARG_ENABLE([library],
- AS_HELP_STRING([--enable-library],[build opencryptoki libraries
@<:@default=yes@:>@]),
- [],
- [enable_library=yes])
-
dnl --- Enable/disable tokens
dnl --- those have an additional 'check' state, which essentially means
dnl --- that it will enable it by default it dependencies are met
@@ -159,7 +135,9 @@ dnl ---
dnl --- Now that we have all the options, let's check for a valid build
dnl ---
-dnl --- enable_debug
+AC_ARG_ENABLE([debug],
+ AS_HELP_STRING([--enable-debug],[enable debugging build
@<:@default=no@:>@]))
+
if test "x$enable_debug" = "xyes"; then
CFLAGS="$CFLAGS -gdwarf-2 -g3 -O0 -DDEBUG"
fi
@@ -444,7 +422,9 @@ dnl --- Now check enabled features, while making sure every
required
dnl --- package is available
dnl ---
-dnl --- enable_testcases
+AC_ARG_ENABLE([testcases],
+ AS_HELP_STRING([--enable-testcases],[build the test cases
@<:@default=no@:>@]))
+
if test "x$enable_testcases" = "xyes"; then
AC_CHECK_PROG([HAVE_EXPECT], [expect], [yes], [no])
@@ -455,11 +435,15 @@ if test "x$enable_testcases" = "xyes"; then
fi
AM_CONDITIONAL([ENABLE_TESTCASES], [test "x$enable_testcases" = "xyes"])
-dnl --- enable_daemon
-AM_CONDITIONAL([ENABLE_DAEMON], [test "x$enable_daemon" = "xyes"])
+dnl --- Check if building daemon
+AC_ARG_ENABLE([daemon],
+ AS_HELP_STRING([--enable-daemon],[build pkcsslotd daemon
@<:@default=yes@:>@]))
+AM_CONDITIONAL([ENABLE_DAEMON], [test "x$enable_daemon" != "xno"])
-dnl --- enable_library
-AM_CONDITIONAL([ENABLE_LIBRARY], [test "x$enable_library" = "xyes"])
+dnl --- Check if building library
+AC_ARG_ENABLE([library],
+ AS_HELP_STRING([--enable-library],[build opencryptoki libraries
@<:@default=yes@:>@]))
+AM_CONDITIONAL([ENABLE_LIBRARY], [test "x$enable_library" != "xno"])
dnl --- enable_icatok
if test "x$enable_icatok" = "xyes"; then
@@ -636,10 +620,10 @@ AC_CONFIG_FILES([Makefile
AC_OUTPUT
echo "Enabled features:"
-echo " Debug build: $enable_debug"
-echo " Testcases: $enable_testcases"
-echo " Daemon build: $enable_daemon"
-echo " Library build: $enable_library"
+echo " Debug build: ${enable_debug:-no}"
+echo " Testcases: ${enable_testcases:-no}"
+echo " Daemon build: ${enable_daemon:-yes}"
+echo " Library build: ${enable_library:-yes}"
echo
echo "Enabled token types:"
echo " ICA token: $enable_icatok"
--
1.7.5.rc1
------------------------------------------------------------------------------
Benefiting from Server Virtualization: Beyond Initial Workload
Consolidation -- Increasing the use of server virtualization is a top
priority.Virtualization can reduce costs, simplify management, and improve
application availability and disaster protection. Learn more about boosting
the value of server virtualization. http://p.sf.net/sfu/vmware-sfdev2dev
_______________________________________________
Opencryptoki-tech mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/opencryptoki-tech
