X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=configure.ac;h=7e41d577bcb30736b03be1f091253cfce2dbdd96;hp=6cda8f967f77aaee2bd1989aaf7aab16551c7ff9;hb=a281d9c7851b16c4c9195d042901540ee9ced799;hpb=3990f247652c3bd41e4ea074e6302277eb9c7aa3 diff --git a/configure.ac b/configure.ac index 6cda8f967..7e41d577b 100644 --- a/configure.ac +++ b/configure.ac @@ -94,7 +94,6 @@ GOBJECT_INTROSPECTION_CHECK([1.31.1]) AM_CONDITIONAL([HAVE_INTROSPECTION], [false]) enable_introspection=no]) -AC_CHECK_TOOL(OBJCOPY, objcopy) AC_CHECK_TOOL(STRINGS, strings) AC_CHECK_TOOL(GPERF, gperf) if test -z "$GPERF" ; then @@ -158,7 +157,7 @@ CC_CHECK_FLAGS_APPEND([with_cflags], [CFLAGS], [\ --param=ssp-buffer-size=4]) AC_SUBST([OUR_CFLAGS], "$with_cflags $address_sanitizer_cflags") -AS_CASE([$CFLAGS], [*-O[[12345g\ ]]*], +AS_CASE([$CFLAGS], [*-O[[12345\ ]]*], [CC_CHECK_FLAGS_APPEND([with_cppflags], [CPPFLAGS], [\ -Wp,-D_FORTIFY_SOURCE=2])], [AC_MSG_RESULT([skipping -D_FORTIFY_SOURCE, optimization not enabled])]) @@ -269,9 +268,9 @@ AC_ARG_ENABLE(kmod, AS_HELP_STRING([--disable-kmod], [disable loadable modules s if test "x$enable_kmod" != "xno"; then PKG_CHECK_EXISTS([ libkmod ], have_kmod=yes, have_kmod=no) if test "x$have_kmod" = "xyes"; then - PKG_CHECK_MODULES(KMOD, [ libkmod >= 14 ], + PKG_CHECK_MODULES(KMOD, [ libkmod >= 15 ], [AC_DEFINE(HAVE_KMOD, 1, [Define if kmod is available])], - AC_MSG_ERROR([*** kmod version >= 14 not found])) + AC_MSG_ERROR([*** kmod version >= 15 not found])) fi if test "x$have_kmod" = xno -a "x$enable_kmod" = xyes; then AC_MSG_ERROR([*** kmod support requested, but libraries not found])