libopkg: fix unsatisfied dependency reporting

[oweals/opkg-lede.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 907911be09bbf51b8fc3f2bff873392f80811927..f65d70467eafd47cccc33f986f7df31ef57716f8 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,6 @@ AC_CONFIG_SRCDIR([libopkg/pkg.c])
 
 AC_CONFIG_AUX_DIR([conf])
 AC_CONFIG_MACRO_DIR([m4])
-AC_CONFIG_MACRO_DIR([shave])
 
 AM_INIT_AUTOMAKE
 AM_CONFIG_HEADER(libopkg/config.h)
@@ -66,13 +65,22 @@ fi
 # check for sha256
 AC_ARG_ENABLE(sha256,
               AC_HELP_STRING([--enable-sha256], [Enable sha256sum check
-      [[default=yes]] ]),
-    [want_sha256="$enableval"], [want_sha256="yes"])
+      (sha256.{c,h} are GPLv3 licensed) [[default=no]] ]),
+    [want_sha256="$enableval"], [want_sha256="no"])
+
+AC_ARG_ENABLE(md5,
+              AC_HELP_STRING([--enable-md5], [Enable md5sum check
+      (md5.{c,h} are GPLv3 licensed) [[default=no]] ]),
+    [want_md5="$enableval"], [want_md5="yes"])
 
 if test "x$want_sha256" = "xyes"; then
   AC_DEFINE(HAVE_SHA256, 1, [Define if you want sha256 support])
 fi
+if test "x$want_md5" = "xyes"; then
+  AC_DEFINE(HAVE_MD5, 1, [Define if you want md5 support])
+fi
 AM_CONDITIONAL(HAVE_SHA256, test "x$want_sha256" = "xyes")
+AM_CONDITIONAL(HAVE_MD5, test "x$want_md5" = "xyes")
 
 # check for openssl
 AC_ARG_ENABLE(openssl,
@@ -170,6 +178,15 @@ if test "x$want_gpgme" = "xyes"; then
   fi
 fi
 
+AC_ARG_ENABLE(usign,
+    AC_HELP_STRING([--enable-usign], [Enable signature checking with usign
+      [[default=yes]] ]),
+    [want_usign="$enableval"], [want_usign="yes"])
+
+if test "x$want_usign" = "xyes"; then
+  AC_DEFINE(HAVE_USIGN, 1, [Define if you want usign support])
+fi
+
 AC_SUBST(GPGME_CFLAGS)
 AC_SUBST(GPGME_LIBS)
 
@@ -277,9 +294,6 @@ AC_SUBST(opkgetcdir)
 AC_SUBST(opkglockfile)
 AC_SUBST([CLEAN_DATE])
 
-# Setup output beautifier.
-SHAVE_INIT([shave], [enable])
-
 AC_OUTPUT(
     Makefile
     libopkg/Makefile
@@ -289,8 +303,6 @@ AC_OUTPUT(
     utils/Makefile
     utils/update-alternatives
     libopkg.pc
-    shave/shave
-    shave/shave-libtool
     man/Makefile
     man/opkg-cl.1
     man/opkg-key.1