diff --git a/configure.ac b/configure.ac index 8c2ef50..2fc75f3 100644 --- a/configure.ac +++ b/configure.ac @@ -305,14 +305,9 @@ AM_CONDITIONAL(LIBDWARF,[test "$WITH_LIBDWARF" = yes]) # which we use too and hopefully is slightly more unique to NSS. WITH_NSS_INCLUDE= WITH_NSS_LIB= -AC_CHECK_HEADERS([nspr.h nss.h sechash.h], [], [ - AC_MSG_ERROR([missing required NSPR / NSS header]) -]) -AC_CHECK_LIB(nss3, NSS_NoDB_Init, [ - WITH_NSS_LIB=-lnss3 -], [ - AC_MSG_ERROR([missing required NSS library 'nss3']) -]) +PKG_CHECK_MODULES(NSS, [ nss >= 3.0.0 ]) +WITH_NSS_INCLUDE=$NSS_CFLAGS +WITH_NSS_LIB=$NSS_LIBS AC_SUBST(WITH_NSS_INCLUDE) AC_SUBST(WITH_NSS_LIB) @@ -1014,9 +1009,6 @@ AC_SUBST(RPMCONFIGDIR) AC_SUBST(OBJDUMP) -if test "$with_external_db" = no; then - AC_CONFIG_SUBDIRS(db3) -fi AM_CONDITIONAL([WITH_INTERNAL_DB],[test "$with_external_db" = no]) AM_CONDITIONAL([DOXYGEN],[test "$DOXYGEN" != no])