diff --git a/configure.ac b/configure.ac index ea91a6d925..cb6c1559bd 100644 --- a/configure.ac +++ b/configure.ac @@ -1850,110 +1850,6 @@ AC_DEFINE([HAVE_DAG],[1],(Endace DAG card support enabled)) fi -# libnspr (enabled by default) - AC_ARG_ENABLE(nspr, - AS_HELP_STRING([--disable-nspr],[Disable libnspr support]), - [enable_nspr=$enableval],[enable_nspr="yes"]) - - AC_ARG_WITH(libnspr_includes, - [ --with-libnspr-includes=DIR libnspr include directory], - [with_libnspr_includes="$withval"],[with_libnspr_includes="no"]) - - AC_ARG_WITH(libnspr_libraries, - [ --with-libnspr-libraries=DIR libnspr library directory], - [with_libnspr_libraries="$withval"],[with_libnspr_libraries="no"]) - - if test "$enable_nspr" != "no"; then - # Try pkg-config first: - PKG_CHECK_MODULES([libnspr],nspr,,[with_pkgconfig_nspr="no"]) - - if test "$with_pkgconfig_nspr" != "no"; then - CPPFLAGS="${CPPFLAGS} ${libnspr_CFLAGS}" - LIBS="${LIBS} ${libnspr_LIBS}" - fi - - if test "$with_libnspr_includes" != "no"; then - CPPFLAGS="${CPPFLAGS} -I${with_libnspr_includes}" - fi - TMPLIBS="${LIBS}" - AC_CHECK_HEADER(nspr.h, - AC_CHECK_LIB(nspr4,PR_GetCurrentThread,[AC_DEFINE([HAVE_NSPR],[1],[libnspr available]) - NSPR="yes" - if test "$NSPR" = "yes"; then - if test "$with_libnspr_libraries" != "no"; then - LDFLAGS="${LDFLAGS} -L${with_libnspr_libraries}" - LIBS="${TMPLIBS}" - else - LIBS="${TMPLIBS}" - fi - fi]),NSPR="no") - - if test "$NSPR" = "no"; then - echo - echo " libnspr library not found, go get it" - echo " from Mozilla or your distribution:" - echo - echo " Ubuntu: apt-get install libnspr4-dev" - echo " Fedora: dnf install nspr-devel" - echo " CentOS/RHEL: yum install nspr-devel" - echo - enable_nspr="no" - fi - fi - - # libnss (enabled by default) - - AC_ARG_ENABLE(nss, - AS_HELP_STRING([--disable-nss],[Disable libnss support]), - [enable_nss=$enableval],[enable_nss="yes"]) - - AC_ARG_WITH(libnss_includes, - [ --with-libnss-includes=DIR libnss include directory], - [with_libnss_includes="$withval"],[with_libnss_includes="no"]) - - AC_ARG_WITH(libnss_libraries, - [ --with-libnss-libraries=DIR libnss library directory], - [with_libnss_libraries="$withval"],[with_libnss_libraries="no"]) - - if test "$enable_nss" != "no"; then - # Try pkg-config first: - PKG_CHECK_MODULES([libnss],nss,,[with_pkgconfig_nss="no"]) - - if test "$with_pkgconfig_nss" != "no"; then - CPPFLAGS="${CPPFLAGS} ${libnss_CFLAGS}" - LIBS="${LIBS} ${libnss_LIBS}" - fi - - if test "$with_libnss_includes" != "no"; then - CPPFLAGS="${CPPFLAGS} -I${with_libnss_includes}" - fi - TMPLIBS="${LIBS}" - - AC_CHECK_HEADER(sechash.h, - AC_CHECK_LIB(nss3,HASH_Begin,[AC_DEFINE([HAVE_NSS],[1],[libnss available]) - NSS="yes" - if test "$NSS" = "yes"; then - if test "$with_libnss_libraries" != "no"; then - LDFLAGS="${LDFLAGS} -L${with_libnss_libraries}" - LIBS="${TMPLIBS}" - else - LIBS="${TMPLIBS}" - fi - fi]),NSS="no") - - if test "$NSS" = "no"; then - echo - echo " libnss library not found, go get it" - echo " from Mozilla or your distribution:" - echo - echo " Ubuntu: apt-get install libnss3-dev" - echo " Fedora: dnf install nss-devel" - echo " CentOS/RHEL: yum install nss-devel" - echo - enable_nss="no" - fi - fi - # libmagic enable_magic="no" AC_ARG_ENABLE(libmagic, @@ -2808,8 +2704,6 @@ SURICATA_BUILD_CONF="Suricata Configuration: Detection enabled: ${enable_detection} Libmagic support: ${enable_magic} - libnss support: ${enable_nss} - libnspr support: ${enable_nspr} libjansson support: ${enable_jansson} hiredis support: ${enable_hiredis} hiredis async with libevent: ${enable_hiredis_async}