libkmod: remove pkcs7 obj_to_hash_algo()

[thirdparty/kmod.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 2e33380a0cc21bd0d98c39fa6c867f3249eb2b89..a6b8fa0308b6e3bece2d551e380f4f061e3037a3 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 AC_PREREQ(2.64)
 AC_INIT([kmod],
-       [25],
+       [31],
        [linux-modules@vger.kernel.org],
        [kmod],
        [http://git.kernel.org/?p=utils/kernel/kmod/kmod.git])
@@ -17,11 +17,13 @@ AM_MAINTAINER_MODE([enable])
 AM_INIT_AUTOMAKE([check-news foreign 1.11 silent-rules tar-pax no-dist-gzip dist-xz subdir-objects color-tests parallel-tests])
 AM_SILENT_RULES([yes])
 LT_INIT([disable-static pic-only])
-DOLT
 
 AS_IF([test "x$enable_static" = "xyes"], [AC_MSG_ERROR([--enable-static is not supported by kmod])])
 AS_IF([test "x$enable_largefile" = "xno"], [AC_MSG_ERROR([--disable-largefile is not supported by kmod])])
 
+module_compressions=""
+module_signatures="legacy"
+
 #####################################################################
 # Program checks and configurations
 #####################################################################
@@ -69,7 +71,8 @@ AC_COMPILE_IFELSE(
 
 AC_MSG_CHECKING([whether _Noreturn is supported])
 AC_COMPILE_IFELSE(
-       [AC_LANG_SOURCE([[_Noreturn int foo(void) { exit(0); }]])],
+       [AC_LANG_SOURCE([[#include <stdlib.h>
+       _Noreturn int foo(void) { exit(0); }]])],
         [AC_DEFINE([HAVE_NORETURN], [1], [Define if _Noreturn is available])
         AC_MSG_RESULT([yes])],
        [AC_MSG_RESULT([no])])
@@ -79,17 +82,34 @@ AC_COMPILE_IFELSE(
 # --with-
 #####################################################################
 
+AC_ARG_WITH([distconfdir], AS_HELP_STRING([--with-distconfdir=DIR], [directory to search for distribution configuration files]),
+        [], [with_distconfdir='${prefix}/lib'])
+AC_SUBST([distconfdir], [$with_distconfdir])
+
 AC_ARG_WITH([rootlibdir],
         AS_HELP_STRING([--with-rootlibdir=DIR], [rootfs directory to install shared libraries]),
         [], [with_rootlibdir=$libdir])
 AC_SUBST([rootlibdir], [$with_rootlibdir])
 
+AC_ARG_WITH([zstd],
+       AS_HELP_STRING([--with-zstd], [handle Zstandard-compressed modules @<:@default=disabled@:>@]),
+       [], [with_zstd=no])
+AS_IF([test "x$with_zstd" != "xno"], [
+       PKG_CHECK_MODULES([libzstd], [libzstd >= 1.4.4], [LIBS="$LIBS $libzstd_LIBS"])
+       AC_DEFINE([ENABLE_ZSTD], [1], [Enable Zstandard for modules.])
+       module_compressions="zstd $module_compressions"
+], [
+       AC_MSG_NOTICE([Zstandard support not requested])
+])
+CC_FEATURE_APPEND([with_features], [with_zstd], [ZSTD])
+
 AC_ARG_WITH([xz],
        AS_HELP_STRING([--with-xz], [handle Xz-compressed modules @<:@default=disabled@:>@]),
        [], [with_xz=no])
 AS_IF([test "x$with_xz" != "xno"], [
-       PKG_CHECK_MODULES([liblzma], [liblzma >= 4.99])
+       PKG_CHECK_MODULES([liblzma], [liblzma >= 4.99], [LIBS="$LIBS $liblzma_LIBS"])
        AC_DEFINE([ENABLE_XZ], [1], [Enable Xz for modules.])
+       module_compressions="xz $module_compressions"
 ], [
        AC_MSG_NOTICE([Xz support not requested])
 ])
@@ -99,8 +119,9 @@ AC_ARG_WITH([zlib],
        AS_HELP_STRING([--with-zlib], [handle gzipped modules @<:@default=disabled@:>@]),
        [], [with_zlib=no])
 AS_IF([test "x$with_zlib" != "xno"], [
-       PKG_CHECK_MODULES([zlib], [zlib])
+       PKG_CHECK_MODULES([zlib], [zlib], [LIBS="$LIBS $zlib_LIBS"])
        AC_DEFINE([ENABLE_ZLIB], [1], [Enable zlib for modules.])
+       module_compressions="gzip $module_compressions"
 ], [
        AC_MSG_NOTICE([zlib support not requested])
 ])
@@ -110,12 +131,13 @@ AC_ARG_WITH([openssl],
        AS_HELP_STRING([--with-openssl], [handle PKCS7 signatures @<:@default=disabled@:>@]),
        [], [with_openssl=no])
 AS_IF([test "x$with_openssl" != "xno"], [
-       PKG_CHECK_MODULES([openssl], [openssl])
+       PKG_CHECK_MODULES([libcrypto], [libcrypto >= 1.1.0], [LIBS="$LIBS $libcrypto_LIBS"])
        AC_DEFINE([ENABLE_OPENSSL], [1], [Enable openssl for modinfo.])
+       module_signatures="PKCS7 $module_signatures"
 ], [
        AC_MSG_NOTICE([openssl support not requested])
 ])
-CC_FEATURE_APPEND([with_features], [with_openssl], [OPENSSL])
+CC_FEATURE_APPEND([with_features], [with_openssl], [LIBCRYPTO])
 
 AC_ARG_WITH([bashcompletiondir],
        AS_HELP_STRING([--with-bashcompletiondir=DIR], [Bash completions directory]),
@@ -214,7 +236,6 @@ GTK_DOC_CHECK([1.14],[--flavour no-tmpl-flat])
 ], [
 AM_CONDITIONAL([ENABLE_GTK_DOC], false)])
 
-
 #####################################################################
 # Default CFLAGS and LDFLAGS
 #####################################################################
@@ -277,11 +298,17 @@ AC_DEFINE_UNQUOTED(KMOD_FEATURES, ["$with_features"], [Features in this build])
 # Generate files from *.in
 #####################################################################
 
+AC_SUBST([module_compressions], $module_compressions)
+AC_SUBST([module_signatures], $module_signatures)
+
 AC_CONFIG_FILES([
        Makefile
        man/Makefile
        libkmod/docs/Makefile
        libkmod/docs/version.xml
+       libkmod/libkmod.pc
+       libkmod/python/kmod/version.py
+       tools/kmod.pc
 ])
 
 
@@ -294,6 +321,7 @@ AC_MSG_RESULT([
 
        prefix:                 ${prefix}
        sysconfdir:             ${sysconfdir}
+       distconfdir:            ${distconfdir}
        libdir:                 ${libdir}
        rootlibdir:             ${rootlibdir}
        includedir:             ${includedir}
@@ -308,7 +336,7 @@ AC_MSG_RESULT([
        tools:                  ${enable_tools}
        python bindings:        ${enable_python}
        logging:                ${enable_logging}
-       compression:            xz=${with_xz}  zlib=${with_zlib}
+       compression:            zstd=${with_zstd}  xz=${with_xz}  zlib=${with_zlib}
        debug:                  ${enable_debug}
        coverage:               ${enable_coverage}
        doc:                    ${enable_gtk_doc}