diff options
| author | Karel Zak | 2011-10-27 12:08:01 +0200 |
|---|---|---|
| committer | Karel Zak | 2011-11-03 12:32:49 +0100 |
| commit | 16ba8d58938f521e2452874fa84a8dff361be440 (patch) | |
| tree | f22a9bab2f9a0067b5a6f02ce37a114cb1729568 | |
| parent | build-sys: remove unnecessary perl check (diff) | |
| download | kernel-qcow2-util-linux-16ba8d58938f521e2452874fa84a8dff361be440.tar.gz kernel-qcow2-util-linux-16ba8d58938f521e2452874fa84a8dff361be440.tar.xz kernel-qcow2-util-linux-16ba8d58938f521e2452874fa84a8dff361be440.zip | |
build-sys: cleanup BUILD_RAW
Signed-off-by: Karel Zak <kzak@redhat.com>
| -rw-r--r-- | configure.ac | 14 | ||||
| -rw-r--r-- | disk-utils/Makefile.am | 2 |
2 files changed, 9 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index 8caeac66d..5ec5f9de5 100644 --- a/configure.ac +++ b/configure.ac @@ -151,11 +151,12 @@ AC_CHECK_HEADERS( sys/un.h \ sys/user.h \ sys/resource.h \ + linux/raw.h \ unistd.h ]) -AC_CHECK_HEADERS([linux/raw.h], - [AM_CONDITIONAL([HAVE_RAW], [true])], - [AM_CONDITIONAL([HAVE_RAW], [false])]) +dnl Convert some ac_cv_header_* variables to have_* +dnl +have_linux_raw_h=$ac_cv_header_linux_raw_h AC_CHECK_HEADERS([langinfo.h], [AM_CONDITIONAL([HAVE_LANGINFO], [true])], @@ -970,9 +971,12 @@ AM_CONDITIONAL(BUILD_MESG, test "x$enable_mesg" = xyes) AC_ARG_ENABLE([raw], AS_HELP_STRING([--enable-raw], [build raw]), - [], enable_raw=no + [], enable_raw=check ) -AM_CONDITIONAL(BUILD_RAW, test "x$enable_raw" = xyes) +build_raw=yes +UL_REQUIRES_LINUX([raw]) +UL_REQUIRES_HAVE([raw], [linux_raw_h], [raw.h header file]) +AM_CONDITIONAL(BUILD_RAW, test "x$build_raw" = xyes) AC_ARG_ENABLE([rename], diff --git a/disk-utils/Makefile.am b/disk-utils/Makefile.am index 6ca19c6a8..56f4e571d 100644 --- a/disk-utils/Makefile.am +++ b/disk-utils/Makefile.am @@ -54,12 +54,10 @@ dist_man_MANS += elvtune.8 elvtune_SOURCES = elvtune.c $(top_srcdir)/lib/linux_version.c endif -if HAVE_RAW if BUILD_RAW sbin_PROGRAMS += raw dist_man_MANS += raw.8 endif -endif if BUILD_CRAMFS cramfs_common = $(utils_common) cramfs.h cramfs_common.c |