tools: kmod: Add handling of compat modinfo

[thirdparty/kmod.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 3c8fdbbc6d7f20be501524617894923eff67504b..4137f0f243a1e88275ef6875ea5237ba6ea47f4a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,13 +1,14 @@
 AC_PREREQ(2.60)
 AC_INIT([kmod],
-       [1],
-       [],
+       [2],
+       [linux-modules@vger.kernel.org],
        [kmod],
        [http://git.profusion.mobi/cgit.cgi/kmod.git/])
 
 AC_CONFIG_SRCDIR([libkmod/libkmod.c])
 AC_CONFIG_AUX_DIR([build-aux])
-AM_INIT_AUTOMAKE([check-news foreign 1.11 silent-rules tar-pax dist-bzip2 subdir-objects])
+AM_INIT_AUTOMAKE([check-news foreign 1.11 silent-rules
+       tar-pax no-dist-gzip dist-xz subdir-objects])
 AC_PROG_CC_STDC
 AC_USE_SYSTEM_EXTENSIONS
 AC_SYS_LARGEFILE
@@ -22,6 +23,22 @@ AC_PROG_CC_C99
 AC_C_TYPEOF
 AM_PROG_CC_C_O
 AC_PROG_GCC_TRADITIONAL
+AC_C_BIGENDIAN
+
+AC_PROG_SED
+AC_PROG_MKDIR_P
+
+required_private_libs=""
+
+AC_ARG_WITH([rootprefix],
+        AS_HELP_STRING([--with-rootprefix=DIR], [rootfs directory prefix for config files and kernel modules]),
+        [], [with_rootprefix=""])
+AC_SUBST([rootprefix], [$with_rootprefix])
+
+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_ENABLE([tools],
         AS_HELP_STRING([--disable-tools], [disable building tools that provide same functionality as module-init-tools @<:@default=enabled@:>@]),
@@ -35,6 +52,25 @@ AS_IF([test "x$enable_logging" = "xyes"], [
        AC_DEFINE(ENABLE_LOGGING, [1], [System logging.])
 ])
 
+AC_ARG_ENABLE([zlib],
+        AS_HELP_STRING([--enable-zlib], [handle gzipped modules @<:@default=disabled@:>@]),
+       [], enable_zlib=no)
+if test "x$enable_zlib" != "xno"; then
+        AC_CHECK_LIB([z], [gzopen],
+                [
+                        zlib_libs="-lz"
+                        required_private_libs="${required_private_libs} ${zlib_libs}"
+                ],
+                [AC_MSG_ERROR([zlib is not present])])
+else
+        AC_MSG_NOTICE([zlib support not requested])
+        zlib_libs=""
+fi
+if test "x$zlib_libs" != "x"; then
+        AC_DEFINE(ENABLE_ZLIB, [1], [Enable zlib for modules.])
+fi
+AC_SUBST(zlib_libs)
+
 AC_ARG_ENABLE([debug],
        AS_HELP_STRING([--enable-debug], [enable debug messages @<:@default=disabled@:>@]),
        [], [enable_debug=no])
@@ -44,6 +80,7 @@ AS_IF([test "x$enable_debug" = "xyes"], [
 
 CC_CHECK_CFLAGS_APPEND([ \
                        -pipe \
+                       -DANOTHER_BRICK_IN_THE \
                        -Wall \
                        -W \
                        -Wextra \
@@ -68,7 +105,6 @@ CC_CHECK_CFLAGS_APPEND([ \
                        -Wmissing-noreturn \
                        -Wshadow \
                        -Wendif-labels \
-                       -Wcast-align \
                        -Wstrict-aliasing=2 \
                        -Wwrite-strings \
                        -Wno-long-long \
@@ -80,11 +116,8 @@ CC_CHECK_CFLAGS_APPEND([ \
                        -Wchar-subscripts \
                        -Wtype-limits \
                        -Wuninitialized \
-                       -Wp,-D_FORTIFY_SOURCE=2 \
-                       -ffast-math \
                        -fno-common \
                        -fdiagnostics-show-option \
-                       -fno-strict-aliasing \
                        -fvisibility=hidden \
                        -ffunction-sections \
                        -fdata-sections \
@@ -92,10 +125,11 @@ CC_CHECK_CFLAGS_APPEND([ \
                        -Wl,--gc-sections])
 
 
+AC_SUBST(required_private_libs)
+
 AC_CONFIG_HEADERS(config.h)
 AC_CONFIG_FILES([
        Makefile
-       libkmod/libkmod.pc
 ])
 
 AC_OUTPUT
@@ -104,8 +138,10 @@ AC_MSG_RESULT([
        ========
 
        prefix:                 ${prefix}
+       rootprefix:             ${rootprefix}
        sysconfdir:             ${sysconfdir}
        libdir:                 ${libdir}
+       rootlibdir:             ${rootlibdir}
        includedir:             ${includedir}
        bindir:                 ${bindir}
 
@@ -115,5 +151,6 @@ AC_MSG_RESULT([
 
        tools:                  ${enable_tools}
        logging:                ${enable_logging}
+        zlib:                   ${enable_zlib}
        debug:                  ${enable_debug}
 ])