diff options
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 33 |
1 files changed, 21 insertions, 12 deletions
diff --git a/configure.ac b/configure.ac index 4fd23141..3d50f571 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -27,13 +27,22 @@ AM_CONFIG_HEADER([MHD_config.h]) | |||
27 | 27 | ||
28 | AH_TOP([#define _GNU_SOURCE 1]) | 28 | AH_TOP([#define _GNU_SOURCE 1]) |
29 | 29 | ||
30 | if test `uname -s` == "OS/S390" | 30 | if test `uname -s` = "OS/390" |
31 | then | 31 | then |
32 | # configure binaries for z/OS | 32 | # configure binaries for z/OS |
33 | CC=`pwd`"/contrib/xcc" | 33 | if test -z $CC |
34 | chmod +x $CC || true | 34 | then |
35 | CPP="c89 -E" | 35 | CC=`pwd`"/contrib/xcc" |
36 | CXXCPP="c++ -E -+" | 36 | chmod +x $CC || true |
37 | fi | ||
38 | if test -z $CPP | ||
39 | then | ||
40 | CPP="c89 -E" | ||
41 | fi | ||
42 | if test -z $CXXCPP | ||
43 | then | ||
44 | CXXCPP="c++ -E -+" | ||
45 | fi | ||
37 | # _CCC_CCMODE=1 | 46 | # _CCC_CCMODE=1 |
38 | # _C89_CCMODE=1 | 47 | # _C89_CCMODE=1 |
39 | fi | 48 | fi |
@@ -134,7 +143,7 @@ AC_CHECK_HEADERS([sys/select.h sys/types.h sys/time.h sys/msg.h netdb.h netinet/ | |||
134 | # libcurl (required for testing) | 143 | # libcurl (required for testing) |
135 | SAVE_LIBS=$LIBS | 144 | SAVE_LIBS=$LIBS |
136 | LIBCURL_CHECK_CONFIG(,,curl=1,curl=0) | 145 | LIBCURL_CHECK_CONFIG(,,curl=1,curl=0) |
137 | AM_CONDITIONAL(HAVE_CURL, test x$curl == x1) | 146 | AM_CONDITIONAL(HAVE_CURL, test x$curl = x1) |
138 | LIBS=$SAVE_LIBS | 147 | LIBS=$SAVE_LIBS |
139 | 148 | ||
140 | # Lib cURL & cURL - OpenSSL versions | 149 | # Lib cURL & cURL - OpenSSL versions |
@@ -157,7 +166,7 @@ AC_ARG_ENABLE(messages, | |||
157 | [enable_messages=$enableval], | 166 | [enable_messages=$enableval], |
158 | [enable_messages="no"]) | 167 | [enable_messages="no"]) |
159 | AC_MSG_RESULT($enable_messages) | 168 | AC_MSG_RESULT($enable_messages) |
160 | if test "$enable_messages" == "yes" | 169 | if test "$enable_messages" = "yes" |
161 | then | 170 | then |
162 | AC_DEFINE([HAVE_MESSAGES],[1],[Include error messages]) | 171 | AC_DEFINE([HAVE_MESSAGES],[1],[Include error messages]) |
163 | fi | 172 | fi |
@@ -224,9 +233,9 @@ AC_ARG_ENABLE([HTTPS], | |||
224 | [enable HTTPS support (default is yes)])], | 233 | [enable HTTPS support (default is yes)])], |
225 | [enable_HTTPS=$enableval], | 234 | [enable_HTTPS=$enableval], |
226 | [enable_HTTPS="yes"]) | 235 | [enable_HTTPS="yes"]) |
227 | if test "$enable_HTTPS" == "yes" | 236 | if test "$enable_HTTPS" = "yes" |
228 | then | 237 | then |
229 | if test "$gcrypt" == "true" | 238 | if test "$gcrypt" = "true" |
230 | then | 239 | then |
231 | AC_DEFINE([HTTPS_SUPPORT],[1],[include HTTPS support]) | 240 | AC_DEFINE([HTTPS_SUPPORT],[1],[include HTTPS support]) |
232 | else | 241 | else |
@@ -238,7 +247,7 @@ else | |||
238 | fi | 247 | fi |
239 | AC_MSG_RESULT($enable_HTTPS) | 248 | AC_MSG_RESULT($enable_HTTPS) |
240 | 249 | ||
241 | AM_CONDITIONAL(ENABLE_HTTPS, test "$enable_HTTPS" == "yes") | 250 | AM_CONDITIONAL(ENABLE_HTTPS, test "$enable_HTTPS" = "yes") |
242 | 251 | ||
243 | # optional: compile TLS client side code [only for test running] ? | 252 | # optional: compile TLS client side code [only for test running] ? |
244 | AC_MSG_CHECKING(--enable-client-side argument) | 253 | AC_MSG_CHECKING(--enable-client-side argument) |
@@ -248,7 +257,7 @@ AC_ARG_ENABLE(client-side, | |||
248 | [enable_client_side=$enableval], | 257 | [enable_client_side=$enableval], |
249 | [enable_client_side="no"]) | 258 | [enable_client_side="no"]) |
250 | AC_MSG_RESULT($enable_client_side) | 259 | AC_MSG_RESULT($enable_client_side) |
251 | if test "$enable_client_side" == "no" | 260 | if test "$enable_client_side" = "no" |
252 | then | 261 | then |
253 | AC_DEFINE([MHD_DEBUG_TLS],[0],[Compile client side code. This will enable running some test cases.]) | 262 | AC_DEFINE([MHD_DEBUG_TLS],[0],[Compile client side code. This will enable running some test cases.]) |
254 | MSG_CLIENT_SIDE="disabled. running some test cases won't be possible" | 263 | MSG_CLIENT_SIDE="disabled. running some test cases won't be possible" |
@@ -357,7 +366,7 @@ AC_MSG_NOTICE([Configuration Summary: | |||
357 | HTTPS support: ${enable_HTTPS} | 366 | HTTPS support: ${enable_HTTPS} |
358 | ]) | 367 | ]) |
359 | 368 | ||
360 | if test "$enable_HTTPS" == "yes" | 369 | if test "$enable_HTTPS" = "yes" |
361 | then | 370 | then |
362 | AC_MSG_NOTICE([HTTPS subsystem configuration: | 371 | AC_MSG_NOTICE([HTTPS subsystem configuration: |
363 | TLS support: ${enable_TLS} | 372 | TLS support: ${enable_TLS} |