tests: fix build of opkg_extract_test

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

diff --git a/configure.ac b/configure.ac
index df58817735031c4c40d3d8d27d866c36dc229edd..f65d70467eafd47cccc33f986f7df31ef57716f8 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,15 +1,20 @@
 # Process this file with autoconf to produce a configure script
-AC_INIT(libopkg/libopkg.c)
+AC_INIT([opkg], [0.1.8])
+AC_CONFIG_SRCDIR([libopkg/pkg.c])
 
 AC_CONFIG_AUX_DIR([conf])
 AC_CONFIG_MACRO_DIR([m4])
 
-AM_INIT_AUTOMAKE([opkg], [0.1.6])
+AM_INIT_AUTOMAKE
 AM_CONFIG_HEADER(libopkg/config.h)
 
 AC_CANONICAL_HOST
 AC_GNU_SOURCE 
 
+# Disable C++/Fortran checks
+define([AC_LIBTOOL_LANG_CXX_CONFIG], [:])
+define([AC_LIBTOOL_LANG_F77_CONFIG], [:])
+
 
 for top_builddir in . .. ../.. $ac_auxdir $ac_auxdir/..; do
   test -f $top_builddir/configure && break
@@ -26,12 +31,13 @@ AC_PROG_INSTALL
 AC_PROG_LN_S
 AM_PROG_INSTALL_STRIP
 AC_PROG_LIBTOOL
+PKG_PROG_PKG_CONFIG([0.20])
 
 # Checks for libraries
 
-dnl extra argument: --with-pathfinder
+dnl extra argument: --enable-pathfinder
 AC_ARG_ENABLE(pathfinder,
-              AC_HELP_STRING([--with-pathfinder], [With libpathfinder support.
+              AC_HELP_STRING([--enable-pathfinder], [Enable libpathfinder support.
       [[default=no]] ]),
     [want_pathfinder="$enableval"], [want_pathfinder="no"])
 dnl Check for libpathfinder
@@ -59,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,
@@ -163,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)
 
@@ -218,13 +242,13 @@ if test x$opkglibdir = x; then
         opkglibdir=/usr/lib
 fi
 
-ipkgetcdir=
+opkgetcdir=
 AC_ARG_WITH(opkgetcdir,
-[  --with-ipkgetcdir=DIR   specifies directory for opkg.conf file,
+[  --with-opkgetcdir=DIR   specifies directory for opkg.conf file,
                            "/opkg" is always added so if you want your files
                            to be in /usr/etc/opkg instead of /etc/opkg
                            you should indicate
-                           --with-ipkgetcdir=/usr/etc ],
+                           --with-opkgetcdir=/usr/etc ],
 [case "${withval}" in
 yes)    AC_MSG_ERROR(bad value ${withval} given for opkg.conf directory ) ;;
 no)     ;;
@@ -236,6 +260,22 @@ if test x$opkgetcdir = x; then
         opkgetcdir=/etc
 fi
 
+opkglockfile=
+AC_ARG_WITH(opkglockfile,
+[  --with-opkglockfile=FILE specifies the file used to make sure there is only
+                           one instance of opkg runnning.
+                           Defaults to ${opkglibdir}/opkg/lock, i.e.
+                           /usr/lib/opkg/lock ],
+[case "${withval}" in
+yes)    AC_MSG_ERROR(bad value ${withval} given for opkg lock file ) ;;
+no)     ;;
+*)      opkglockfile=$with_opkglockfile ;;
+esac])
+
+# Default if empty
+if test x$opkglockfile = x; then
+        opkglockfile=${opkglibdir}/opkg/lock
+fi
 
 dnl Some special cases for the wow64 build
 if test "x$want_gpgme" = "xyes"
@@ -247,10 +287,12 @@ Use --disable-gpg if you want OpenSSL smime signatures])
        fi
 fi
 
-
+CLEAN_DATE=`date +"%B %Y" | tr -d '\n'`
 
 AC_SUBST(opkglibdir)
 AC_SUBST(opkgetcdir)
+AC_SUBST(opkglockfile)
+AC_SUBST([CLEAN_DATE])
 
 AC_OUTPUT(
     Makefile
@@ -259,5 +301,9 @@ AC_OUTPUT(
     src/Makefile
     libbb/Makefile
     utils/Makefile
+    utils/update-alternatives
     libopkg.pc
+    man/Makefile
+    man/opkg-cl.1
+    man/opkg-key.1
     )