tools: kmod: Add handling of compat modinfo

[thirdparty/kmod.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 6d32fee93ed53fdf398804efe47ad227e78923f5..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
@@ -24,8 +25,21 @@ 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@:>@]),
        [], enable_tools=yes)
@@ -39,33 +53,15 @@ AS_IF([test "x$enable_logging" = "xyes"], [
 ])
 
 AC_ARG_ENABLE([zlib],
-        AS_HELP_STRING([--enable-zlib], [handle gzipped modules (options: static or dynamic) @<:@default=disabled@:>@]),
+        AS_HELP_STRING([--enable-zlib], [handle gzipped modules @<:@default=disabled@:>@]),
        [], enable_zlib=no)
-if test "x$enable_zlib" = "xyes" -o "x$enable_zlib" = "xstatic"; then
-        enable_zlib="static"
-        zlib_libs="-Wl,-Bstatic -lz -Wl,-Bdynamic"
-        SAVE_LIBS="${LIBS}"
-        LIBS="${LIBS} ${zlib_libs}"
-        AC_MSG_CHECKING([if static zlib exists])
-        AC_LINK_IFELSE([AC_LANG_PROGRAM([[
-                #include <zlib.h>
-        ]], [[
-                gzFile f = gzopen("/tmp", "rb");
-        ]])],
-        [have_zlib=yes], [have_zlib=no])
-        LIBS="${SAVE_LIBS}"
-        AC_MSG_RESULT([$have_zlib])
-        if test "x$have_zlib" != "xyes"; then
-                zlib_libs=""
-                AC_MSG_ERROR([static zlib is not present])
-        fi
-elif test "x$enable_zlib" = "xdynamic"; then
+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([dynamic zlib is not present])])
+                [AC_MSG_ERROR([zlib is not present])])
 else
         AC_MSG_NOTICE([zlib support not requested])
         zlib_libs=""
@@ -84,6 +80,7 @@ AS_IF([test "x$enable_debug" = "xyes"], [
 
 CC_CHECK_CFLAGS_APPEND([ \
                        -pipe \
+                       -DANOTHER_BRICK_IN_THE \
                        -Wall \
                        -W \
                        -Wextra \
@@ -108,7 +105,6 @@ CC_CHECK_CFLAGS_APPEND([ \
                        -Wmissing-noreturn \
                        -Wshadow \
                        -Wendif-labels \
-                       -Wcast-align \
                        -Wstrict-aliasing=2 \
                        -Wwrite-strings \
                        -Wno-long-long \
@@ -120,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 \
@@ -137,7 +130,6 @@ AC_SUBST(required_private_libs)
 AC_CONFIG_HEADERS(config.h)
 AC_CONFIG_FILES([
        Makefile
-       libkmod/libkmod.pc
 ])
 
 AC_OUTPUT
@@ -146,8 +138,10 @@ AC_MSG_RESULT([
        ========
 
        prefix:                 ${prefix}
+       rootprefix:             ${rootprefix}
        sysconfdir:             ${sysconfdir}
        libdir:                 ${libdir}
+       rootlibdir:             ${rootlibdir}
        includedir:             ${includedir}
        bindir:                 ${bindir}