aiden
/
suricata
mirror of https://github.com/OISF/suricata
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

configure: fix and cleanup nss and nspr detection

Browse Source
pull/3500/head
Victor Julien 7 years ago
parent 4d5024255f
commit 4ece6ba758
1 changed files with 67 additions and 66 deletions
Show Stats Download Patch File Download Diff File

133
configure.ac
Unescape Escape View File

@ -1646,10 +1646,10 @@
AC_DEFINE([HAVE_DAG],[1],(Endace DAG card support enabled)) AC_DEFINE([HAVE_DAG],[1],(Endace DAG card support enabled))
fi fi
# libnspr # libnspr
enable_nspr="no"
AC_ARG_ENABLE(nspr, AC_ARG_ENABLE(nspr,
AS_HELP_STRING([--disable-nspr],[Disable libnspr support])) AS_HELP_STRING([--disable-nspr],[Disable libnspr support]),
[enable_nspr=$enableval],[enable_nspr="yes"])
AC_ARG_WITH(libnspr_includes, AC_ARG_WITH(libnspr_includes,
[ --with-libnspr-includes=DIR libnspr include directory], [ --with-libnspr-includes=DIR libnspr include directory],
[with_libnspr_includes="$withval"],[with_libnspr_includes=no]) [with_libnspr_includes="$withval"],[with_libnspr_includes=no])
@ -1658,86 +1658,87 @@
[with_libnspr_libraries="$withval"],[with_libnspr_libraries="no"]) [with_libnspr_libraries="$withval"],[with_libnspr_libraries="no"])
if test "$enable_nspr" != "no"; then if test "$enable_nspr" != "no"; then
# Try pkg-config first: # Try pkg-config first:
PKG_CHECK_MODULES([libnspr], nspr,, [with_pkgconfig_nspr=no]) PKG_CHECK_MODULES([libnspr], nspr,, [with_pkgconfig_nspr=no])
if test "$with_pkgconfig_nspr" != "no"; then if test "$with_pkgconfig_nspr" != "no"; then
CPPFLAGS="${CPPFLAGS} ${libnspr_CFLAGS}" CPPFLAGS="${CPPFLAGS} ${libnspr_CFLAGS}"
LIBS="${LIBS} ${libnspr_LIBS}" LIBS="${LIBS} ${libnspr_LIBS}"
fi fi
if test "$with_libnspr_includes" != "no"; then if test "$with_libnspr_includes" != "no"; then
CPPFLAGS="${CPPFLAGS} -I${with_libnspr_includes}" CPPFLAGS="${CPPFLAGS} -I${with_libnspr_includes}"
fi fi
AC_CHECK_HEADER(nspr.h,NSPR="yes",NSPR="no") AC_CHECK_HEADER(nspr.h,NSPR="yes",NSPR="no")
if test "$NSPR" = "yes"; then if test "$NSPR" = "yes"; then
if test "$with_libnspr_libraries" != "no"; then if test "$with_libnspr_libraries" != "no"; then
LDFLAGS="${LDFLAGS} -L${with_libnspr_libraries}" LDFLAGS="${LDFLAGS} -L${with_libnspr_libraries}"
fi fi
AC_CHECK_LIB(nspr4, PR_GetCurrentThread,, NSPR="no") AC_CHECK_LIB(nspr4, PR_GetCurrentThread,, NSPR="no")
if test "$NSPR" = "no"; then if test "$NSPR" = "no"; then
echo echo
echo " ERROR! libnspr library not found, go get it" echo " ERROR! libnspr library not found, go get it"
echo " from Mozilla or your distribution:" echo " from Mozilla or your distribution:"
echo echo
echo " Ubuntu: apt-get install libnspr4-dev" echo " Ubuntu: apt-get install libnspr4-dev"
echo " Fedora: dnf install nspr-devel" echo " Fedora: dnf install nspr-devel"
echo " CentOS/RHEL: yum install nspr-devel" echo " CentOS/RHEL: yum install nspr-devel"
echo echo
exit 1 exit 1
fi fi
enable_nspr="yes" else
fi enable_nspr="no"
fi
fi fi
# libnss # libnss
enable_nss="no"
AC_ARG_ENABLE(nss, AC_ARG_ENABLE(nss,
AS_HELP_STRING([--disable-nss],[Disable libnss support])) AS_HELP_STRING([--disable-nss],[Disable libnss support]),
[enable_nss=$enableval],[enable_nss="yes"])
AC_ARG_WITH(libnss_includes, AC_ARG_WITH(libnss_includes,
[ --with-libnss-includes=DIR libnss include directory], [ --with-libnss-includes=DIR libnss include directory],
[with_libnss_includes="$withval"],[with_libnss_includes=no]) [with_libnss_includes="$withval"],[with_libnss_includes="no"])
AC_ARG_WITH(libnss_libraries, AC_ARG_WITH(libnss_libraries,
[ --with-libnss-libraries=DIR libnss library directory], [ --with-libnss-libraries=DIR libnss library directory],
[with_libnss_libraries="$withval"],[with_libnss_libraries="no"]) [with_libnss_libraries="$withval"],[with_libnss_libraries="no"])
if test "$enable_nss" != "no"; then if test "$enable_nss" != "no"; then
# Try pkg-config first: # Try pkg-config first:
PKG_CHECK_MODULES([libnss], nss,, [with_pkgconfig_nss=no]) PKG_CHECK_MODULES([libnss], nss,, [with_pkgconfig_nss=no])
if test "$with_pkgconfig_nss" != "no"; then if test "$with_pkgconfig_nss" != "no"; then
CPPFLAGS="${CPPFLAGS} ${libnss_CFLAGS}" CPPFLAGS="${CPPFLAGS} ${libnss_CFLAGS}"
LIBS="${LIBS} ${libnss_LIBS}" LIBS="${LIBS} ${libnss_LIBS}"
fi fi
if test "$with_libnss_includes" != "no"; then
if test "$with_libnss_includes" != "no"; then CPPFLAGS="${CPPFLAGS} -I${with_libnss_includes}"
CPPFLAGS="${CPPFLAGS} -I${with_libnss_includes}" fi
fi
AC_CHECK_HEADER(sechash.h,NSS="yes",NSS="no") AC_CHECK_HEADER(sechash.h,NSS="yes",NSS="no")
if test "$NSS" = "yes"; then if test "$NSS" = "yes"; then
if test "$with_libnss_libraries" != "no"; then if test "$with_libnss_libraries" != "no"; then
LDFLAGS="${LDFLAGS} -L${with_libnss_libraries}" LDFLAGS="${LDFLAGS} -L${with_libnss_libraries}"
fi fi
AC_CHECK_LIB(nss3, HASH_Begin,, NSS="no") AC_CHECK_LIB(nss3, HASH_Begin,, NSS="no")
if test "$NSS" = "no"; then
if test "$NSS" = "no"; then echo
echo echo " ERROR! libnss library not found, go get it"
echo " ERROR! libnss library not found, go get it" echo " from Mozilla or your distribution:"
echo " from Mozilla or your distribution:" echo
echo echo " Ubuntu: apt-get install libnss3-dev"
echo " Ubuntu: apt-get install libnss3-dev" echo " Fedora: dnf install nss-devel"
echo " Fedora: dnf install nss-devel" echo " CentOS/RHEL: yum install nss-devel"
echo " CentOS/RHEL: yum install nss-devel" echo
echo exit 1
exit 1 fi
fi
AC_DEFINE([HAVE_NSS],[1],[libnss available for md5]) AC_DEFINE([HAVE_NSS],[1],[libnss available for md5/sha1/sha256])
enable_nss="yes" enable_nss="yes"
fi else
enable_nss="no"
fi
fi fi
# libmagic # libmagic

Write Preview
Loading…
Cancel
Save