diff options
| -rw-r--r-- | Makefile.am | 11 | ||||
| -rw-r--r-- | applets.h | 4 | ||||
| -rw-r--r-- | configure.ac | 27 |
3 files changed, 4 insertions, 38 deletions
diff --git a/Makefile.am b/Makefile.am index 7dbcf42c..d3ebafcc 100644 --- a/Makefile.am +++ b/Makefile.am @@ -22,6 +22,7 @@ APPLETS = \ qsearch \ qsize \ qtbz2 \ + qtegrity \ quse \ qwhich \ qxpak \ @@ -42,6 +43,7 @@ dist_man_MANS = \ man/qsearch.1 \ man/qsize.1 \ man/qtbz2.1 \ + man/qtegrity.1 \ man/quse.1 \ man/qwhich.1 \ man/qxpak.1 \ @@ -64,6 +66,7 @@ q_SOURCES = \ qsearch.c \ qsize.c \ qtbz2.c \ + qtegrity.c \ quse.c \ qwhich.c \ qxpak.c \ @@ -73,7 +76,6 @@ q_CPPFLAGS = \ -I$(top_builddir)/autotools/gnulib \ -I$(top_srcdir)/autotools/gnulib \ $(OPENMP_CFLAGS) \ - $(LIBSSL_CFLAGS) \ $(LIBBL2_CFLAGS) \ $(LIBZ_CFLAGS) \ $(NULL) @@ -81,10 +83,10 @@ q_LDADD = \ $(top_builddir)/libq/libq.a \ $(top_builddir)/autotools/gnulib/libgnu.a \ $(OPENMP_CFLAGS) \ - $(LIBSSL_LIBS) \ $(LIBBL2_LIBS) \ $(LIBZ_LIBS) \ $(GPGME_LIBS) \ + $(LIB_CRYPTO) \ $(LIB_CLOCK_GETTIME) \ $(LIB_EACCESS) \ $(SENDFILE_LIBS) \ @@ -97,11 +99,6 @@ q_CPPFLAGS += \ dist_man_MANS += man/qmanifest.1 APPLETS += qmanifest endif -if QTEGRITY_ENABLED -q_SOURCES += qtegrity.c -dist_man_MANS += man/qtegrity.1 -APPLETS += qtegrity -endif install-exec-hook: @@ -88,9 +88,7 @@ static const struct applet_t { {"qsearch", qsearch_main, "<regex>", "search pkgname/desc"}, {"qsize", qsize_main, "<pkgname>", "calculate size usage"}, {"qtbz2", qtbz2_main, "<misc args>", "manipulate tbz2 packages"}, -#ifdef ENABLE_QTEGRITY {"qtegrity", qtegrity_main, "<misc args>", "verify files with IMA"}, -#endif {"quse", quse_main, "<useflag>", "find pkgs using useflags"}, {"qwhich", qwhich_main, "<pkg ...>", "find path to pkg"}, {"qxpak", qxpak_main, "<misc args>", "manipulate xpak archives"}, @@ -113,10 +111,8 @@ static const struct applet_t { {"uickpkg", qpkg_main, NULL, NULL}, /* {"glsa", qglsa_main, NULL, NULL}, */ -#ifdef ENABLE_QTEGRITY /* alias for qtegrity */ {"integrity", qtegrity_main, NULL, NULL}, -#endif #ifdef ENABLE_QMANIFEST /* old hashgen */ diff --git a/configure.ac b/configure.ac index c26848ab..7d101c43 100644 --- a/configure.ac +++ b/configure.ac @@ -52,28 +52,6 @@ AC_SUBST([CONFIG_EPREFIX], ["$with_eprefix"]) AC_ARG_ENABLE([qmanifest], [AS_HELP_STRING([--enable-qmanifest], [support qmanifest applet])]) -AC_ARG_ENABLE([qtegrity], [AS_HELP_STRING([--enable-qtegrity], - [support qtegrity applet])]) - -AS_IF([test "x${enable_qmanifest}${enable_qtegrity}" != "xnono"], [ - PKG_CHECK_MODULES([LIBSSL], [libcrypto], [ - AC_DEFINE([HAVE_SSL], [1], [Define if you have ssl]) - LIBSSL="yes" - ], [ - AS_IF([test "x${enable_qmanifest}" = "xyes"], [ - AC_MSG_FAILURE([--enable-qmanifest was given, but libcrypto.pc could not be found]) - ]) - AS_IF([test "x${enable_qtegrity}" = "xyes"], [ - AC_MSG_FAILURE([--enable-qtegrity was given, but libcrypto.pc could not be found]) - ]) - LIBSSL="no: missing dependencies" - ]) - AC_MSG_CHECKING([whether to enable qtegrity]) - AC_MSG_RESULT([${LIBSSL}]) -], [ - AC_MSG_CHECKING([whether to enable qtegrity]) - AC_MSG_RESULT([no: disabled by configure argument]) -]) AS_IF([test "x${enable_qmanifest}" != "xno"], [ PKG_CHECK_MODULES([LIBBL2], [libb2], [ @@ -117,15 +95,10 @@ AS_IF([test "x${enable_qmanifest}" != "xno"], [ ]) AM_CONDITIONAL([QMANIFEST_ENABLED], [test "x$enable_qmanifest" != xno]) -AM_CONDITIONAL([QTEGRITY_ENABLED], [test "x$enable_qtegrity" != xno]) if test "x$enable_qmanifest" != xno ; then AC_DEFINE([ENABLE_QMANIFEST], [1], [Define if qmanifest should be compiled]) fi -if test "x$enable_qtegrity" != xno ; then - AC_DEFINE([ENABLE_QTEGRITY], [1], - [Define if qtegrity should be compiled]) -fi AX_CFLAGS_WARN_ALL AC_DEFUN([PT_CHECK_CFLAG],[AX_CHECK_COMPILER_FLAGS([$1],[CFLAGS="$CFLAGS $1"])]) |