From: Karel Zak Date: Fri, 11 Feb 2011 08:42:49 +0000 (+0100) Subject: build-sys: don't build lsblk on Linux without openat() X-Git-Tag: v2.20-rc1~580 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7f7126d749cb538547dd7bf85dc358f025ce6ea9;p=thirdparty%2Futil-linux.git build-sys: don't build lsblk on Linux without openat() Reported-by: Peter Breitenlohner Signed-off-by: Karel Zak --- diff --git a/configure.ac b/configure.ac index f0e244b1af..ee3e71e909 100644 --- a/configure.ac +++ b/configure.ac @@ -871,6 +871,15 @@ else fi AM_CONDITIONAL(BUILD_CRAMFS, test "x$build_cramfs" = xyes) +build_lsblk=yes +if test "x$have_openat" = xno; then + AC_MSG_WARN([openat() function not found; do not build lsblk]) + build_lsblk=no +elif test "x$have_linux" = xno; then + AC_MSG_WARN([non-linux system; do not build lsblk]) + build_lsblk=no +fi +AM_CONDITIONAL(BUILD_LSBLK, test "x$build_lsblk" = xyes) AC_ARG_ENABLE([switch_root], AS_HELP_STRING([--disable-switch_root], [do not build switch_root]), diff --git a/misc-utils/Makefile.am b/misc-utils/Makefile.am index 3f0843b2c2..3bae648602 100644 --- a/misc-utils/Makefile.am +++ b/misc-utils/Makefile.am @@ -50,7 +50,7 @@ wipefs_SOURCES = wipefs.c $(top_srcdir)/lib/strutils.c wipefs_LDADD = $(ul_libblkid_la) wipefs_CFLAGS = $(AM_CFLAGS) -I$(ul_libblkid_incdir) -if LINUX +if BUILD_LSBLK bin_PROGRAMS += lsblk dist_man_MANS += lsblk.8 lsblk_SOURCES = lsblk.c \