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

configure: allow to disable libnss and libnspr

Browse Source 
Let user chose to disable libnss and libnspr support even if these
libraries are installed in the system. Default remains to enable when
libraries are found and disable parameter were not used
pull/3315/head
Renato Botelho 8 years ago committed by Victor Julien
parent 91307dafd9
commit 8f926fb75a
1 changed files with 63 additions and 59 deletions
Show Stats Download Patch File Download Diff File

122
configure.ac
Unescape Escape View File

@ -1586,15 +1586,8 @@
fi fi
# libnspr # libnspr
enable_nspr="no" AC_ARG_ENABLE(nspr,
AS_HELP_STRING([--disable-nspr],[Disable libnspr support]))
# 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
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])
@ -1602,41 +1595,43 @@
[ --with-libnspr-libraries=DIR libnspr library directory], [ --with-libnspr-libraries=DIR libnspr library directory],
[with_libnspr_libraries="$withval"],[with_libnspr_libraries="no"]) [with_libnspr_libraries="$withval"],[with_libnspr_libraries="no"])
if test "$with_libnspr_includes" != "no"; then if test "$enable_nspr" != "no"; then
CPPFLAGS="${CPPFLAGS} -I${with_libnspr_includes}" # Try pkg-config first:
fi 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
AC_CHECK_HEADER(nspr.h,NSPR="yes",NSPR="no") if test "$with_libnspr_includes" != "no"; then
if test "$NSPR" = "yes"; then CPPFLAGS="${CPPFLAGS} -I${with_libnspr_includes}"
if test "$with_libnspr_libraries" != "no"; then fi
LDFLAGS="${LDFLAGS} -L${with_libnspr_libraries}"
fi
AC_CHECK_LIB(nspr4, PR_GetCurrentThread,, NSPR="no") AC_CHECK_HEADER(nspr.h,NSPR="yes",NSPR="no")
if test "$NSPR" = "yes"; then
if test "$with_libnspr_libraries" != "no"; then
LDFLAGS="${LDFLAGS} -L${with_libnspr_libraries}"
fi
if test "$NSPR" = "no"; then AC_CHECK_LIB(nspr4, PR_GetCurrentThread,, NSPR="no")
echo
echo " ERROR! libnspr library not found, go get it" if test "$NSPR" = "no"; then
echo " from Mozilla or your distribution:" echo
echo echo " ERROR! libnspr library not found, go get it"
echo " Ubuntu: apt-get install libnspr4-dev" echo " from Mozilla or your distribution:"
echo " Fedora: yum install nspr-devel" echo
echo echo " Ubuntu: apt-get install libnspr4-dev"
exit 1 echo " Fedora: yum install nspr-devel"
fi echo
enable_nspr="yes" exit 1
fi
enable_nspr="yes"
fi
fi fi
# libnss # libnss
enable_nss="no" AC_ARG_ENABLE(nss,
AS_HELP_STRING([--disable-nss],[Disable libnss support]))
# 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
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])
@ -1644,31 +1639,40 @@
[ --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 "$with_libnss_includes" != "no"; then if test "$enable_nss" != "no"; then
CPPFLAGS="${CPPFLAGS} -I${with_libnss_includes}" # Try pkg-config first:
fi 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
AC_CHECK_HEADER(sechash.h,NSS="yes",NSS="no") if test "$with_libnss_includes" != "no"; then
if test "$NSS" = "yes"; then CPPFLAGS="${CPPFLAGS} -I${with_libnss_includes}"
if test "$with_libnss_libraries" != "no"; then fi
LDFLAGS="${LDFLAGS} -L${with_libnss_libraries}"
fi
AC_CHECK_LIB(nss3, HASH_Begin,, NSS="no") AC_CHECK_HEADER(sechash.h,NSS="yes",NSS="no")
if test "$NSS" = "yes"; then
if test "$with_libnss_libraries" != "no"; then
LDFLAGS="${LDFLAGS} -L${with_libnss_libraries}"
fi
if test "$NSS" = "no"; then AC_CHECK_LIB(nss3, HASH_Begin,, NSS="no")
echo
echo " ERROR! libnss library not found, go get it" if test "$NSS" = "no"; then
echo " from Mozilla or your distribution:" echo
echo echo " ERROR! libnss library not found, go get it"
echo " Ubuntu: apt-get install libnss3-dev" echo " from Mozilla or your distribution:"
echo " Fedora: yum install nss-devel" echo
echo echo " Ubuntu: apt-get install libnss3-dev"
exit 1 echo " Fedora: yum install nss-devel"
fi echo
exit 1
fi
AC_DEFINE([HAVE_NSS],[1],[libnss available for md5]) AC_DEFINE([HAVE_NSS],[1],[libnss available for md5])
enable_nss="yes" enable_nss="yes"
fi
fi fi
# libmagic # libmagic

Write Preview
Loading…
Cancel
Save