diff options
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 33 |
1 files changed, 18 insertions, 15 deletions
diff --git a/configure.ac b/configure.ac index ee516f80..3a45b35d 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -82,37 +82,40 @@ AC_ARG_ENABLE([randombytes-stir], | |||
82 | ] | 82 | ] |
83 | ) | 83 | ) |
84 | 84 | ||
85 | AC_ARG_ENABLE([logging], | 85 | AC_ARG_ENABLE([log], |
86 | [AC_HELP_STRING([--enable-logging], [enable logging (default: auto)]) ], | 86 | [AC_HELP_STRING([--enable-log], [enable logging (default: auto)]) ], |
87 | [ | 87 | [ |
88 | if test "x$enableval" = "xyes"; then | 88 | if test "x$enableval" = "xyes"; then |
89 | LOGGING="yes" | 89 | LOGGING="yes" |
90 | 90 | ||
91 | AC_DEFINE([LOGGING], [], [If logging enabled]) | 91 | AC_DEFINE([LOGGING], [], [If logging enabled]) |
92 | AC_DEFINE([LOGGER_LEVEL], [DEBUG], [LoggerLevel value]) | 92 | AC_DEFINE([LOGGER_LEVEL], [LOG_DEBUG], [LOG_LEVEL value]) |
93 | AC_DEFINE_UNQUOTED([LOGGER_OUTPUT_FILE], ["$LOGGING_OUTNAM"], [Output of logger]) | 93 | AC_DEFINE_UNQUOTED([LOGGER_OUTPUT_FILE], ["$LOGGING_OUTNAM"], [Output of logger]) |
94 | fi | 94 | fi |
95 | ] | 95 | ] |
96 | ) | 96 | ) |
97 | 97 | ||
98 | AC_ARG_WITH(logger-level, | 98 | AC_ARG_WITH(log-level, |
99 | AC_HELP_STRING([--with-logger-level=LEVEL], | 99 | AC_HELP_STRING([--with-log-level=LEVEL], |
100 | [Logger levels: INFO; DEBUG; WARNING; ERROR ]), | 100 | [Logger levels: TRACE; DEBUG; INFO; WARNING; ERROR ]), |
101 | [ | 101 | [ |
102 | if test "x$LOGGING" = "xno"; then | 102 | if test "x$LOGGING" = "xno"; then |
103 | AC_MSG_WARN([Logging disabled!]) | 103 | AC_MSG_WARN([Logging disabled!]) |
104 | else | 104 | else |
105 | if test "x$withval" = "xINFO"; then | 105 | if test "x$withval" = "xTRACE"; then |
106 | AC_DEFINE([LOGGER_LEVEL], [INFO], [LoggerLevel value]) | 106 | AC_DEFINE([LOGGER_LEVEL], [LOG_TRACE], [LOG_LEVEL value]) |
107 | 107 | ||
108 | elif test "x$withval" = "xDEBUG"; then | 108 | elif test "x$withval" = "xDEBUG"; then |
109 | AC_DEFINE([LOGGER_LEVEL], [DEBUG], [LoggerLevel value]) | 109 | AC_DEFINE([LOGGER_LEVEL], [LOG_DEBUG], [LOG_LEVEL value]) |
110 | 110 | ||
111 | elif test "x$withval" = "xINFO"; then | ||
112 | AC_DEFINE([LOGGER_LEVEL], [LOG_INFO], [LOG_LEVEL value]) | ||
113 | |||
111 | elif test "x$withval" = "xWARNING"; then | 114 | elif test "x$withval" = "xWARNING"; then |
112 | AC_DEFINE([LOGGER_LEVEL], [WARNING], [LoggerLevel value]) | 115 | AC_DEFINE([LOGGER_LEVEL], [LOG_WARNING], [LOG_LEVEL value]) |
113 | 116 | ||
114 | elif test "x$withval" = "xERROR"; then | 117 | elif test "x$withval" = "xERROR"; then |
115 | AC_DEFINE([LOGGER_LEVEL], [ERROR], [LoggerLevel value]) | 118 | AC_DEFINE([LOGGER_LEVEL], [LOG_ERROR], [LOG_LEVEL value]) |
116 | else | 119 | else |
117 | AC_MSG_WARN([Invalid logger level: $withval. Using default 'DEBUG']) | 120 | AC_MSG_WARN([Invalid logger level: $withval. Using default 'DEBUG']) |
118 | fi | 121 | fi |
@@ -120,8 +123,8 @@ AC_ARG_WITH(logger-level, | |||
120 | ] | 123 | ] |
121 | ) | 124 | ) |
122 | 125 | ||
123 | AC_ARG_WITH(logger-path, | 126 | AC_ARG_WITH(log-path, |
124 | AC_HELP_STRING([--with-logger-path=DIR], | 127 | AC_HELP_STRING([--with-log-path=DIR], |
125 | [Path of logger output]), | 128 | [Path of logger output]), |
126 | [ | 129 | [ |
127 | if test "x$LOGGING" = "xno"; then | 130 | if test "x$LOGGING" = "xno"; then |