Download as
Browse Code »

Commit abe0940bfbd329297d42c992d1973db3f640adf2

Authored by Perry Werneck
2 parents c4e99813 e4475241
Exists in master and in 1 other branch develop

Merge branch 'master' into develop

Showing 2 changed files with 13 additions and 2 deletions   Show diff stats
@@ -345,7 +345,7 @@ install-static: \ @@ -345,7 +345,7 @@ install-static: \
345 install-delayed: \ 345 install-delayed: \
346 $(BINRLS)/$(LIBNAME).delayed.a 346 $(BINRLS)/$(LIBNAME).delayed.a
347 347
348 - # Install static library 348 + # Install delayed library
349 @$(MKDIR) \ 349 @$(MKDIR) \
350 $(DESTDIR)$(libdir) 350 $(DESTDIR)$(libdir)
351 351
@@ -394,7 +394,18 @@ dnl --------------------------------------------------------------------------- @@ -394,7 +394,18 @@ dnl ---------------------------------------------------------------------------
394 dnl SSL Security options 394 dnl SSL Security options
395 dnl --------------------------------------------------------------------------- 395 dnl ---------------------------------------------------------------------------
396 396
397 -AC_CHECK_HEADER(openssl/fips.h, AC_DEFINE(HAVE_FIPS_H, 1, [FIPS Header is available]), AC_MSG_NOTICE(fips.h is not available)) 397 +AC_ARG_ENABLE([fips],
  398 + [AS_HELP_STRING([--disable-fips], [Disable OpenSSL FIPS])],
  399 +[
  400 + app_cv_fips="$enableval"
  401 +],[
  402 + AC_CHECK_HEADER(openssl/fips.h, app_cv_fips="yes", AC_MSG_NOTICE(fips.h is not available))
  403 +
  404 +])
  405 +
  406 +if test "$app_cv_fips" == "yes"; then
  407 + AC_DEFINE(HAVE_FIPS_H, 1, [FIPS Header is available])
  408 +fi
398 409
399 AC_ARG_ENABLE([self-signed-cert-check], 410 AC_ARG_ENABLE([self-signed-cert-check],
400 [AS_HELP_STRING([--enable-self-signed-cert-check], [Emit Warning when host presents a self signed certificate])], 411 [AS_HELP_STRING([--enable-self-signed-cert-check], [Emit Warning when host presents a self signed certificate])],