diff options
| author | Karel Zak | 2011-10-27 14:48:49 +0200 |
|---|---|---|
| committer | Karel Zak | 2011-11-03 12:32:50 +0100 |
| commit | 3aecf79deab24f985a393d996ca10cab70a5cbd2 (patch) | |
| tree | 1485d02590a0f07d9960f58dc18a71479a063b94 /configure.ac | |
| parent | build-sys: move gettext check before --enable-* (diff) | |
| download | kernel-qcow2-util-linux-3aecf79deab24f985a393d996ca10cab70a5cbd2.tar.gz kernel-qcow2-util-linux-3aecf79deab24f985a393d996ca10cab70a5cbd2.tar.xz kernel-qcow2-util-linux-3aecf79deab24f985a393d996ca10cab70a5cbd2.zip | |
build-sys: move type checks before --enable-*
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 68 |
1 files changed, 33 insertions, 35 deletions
diff --git a/configure.ac b/configure.ac index 6bc46b623..3803c916c 100644 --- a/configure.ac +++ b/configure.ac @@ -351,6 +351,39 @@ as) ;; esac +UL_CHECK_LIB(util, openpty) +UL_CHECK_LIB(termcap, tgetnum) + +AC_CHECK_TYPES([union semun], [], [], [[ +#include <sys/sem.h> +]]) +AC_CHECK_TYPES(loff_t) + +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ +#include <wchar.h> +#include <wctype.h> +#include <stdio.h> +]], [[ + wchar_t wc; + wint_t w; + w = fgetwc(stdin); + if (w == WEOF) exit(1); + wc = w; + fputwc(wc,stdout); +]])], +[AC_DEFINE(HAVE_WIDECHAR,1,Do we have wide character support?) +]) + +AC_CHECK_TYPES([cpu_set_t], [have_cpu_set_t=yes], [], [[ +#include <sched.h> +]]) + +AM_CONDITIONAL(HAVE_CPU_SET_T, [test "x$have_cpu_set_t" = xyes]) + +AC_CHECK_DECLS([CPU_ALLOC], [], [], [[ +#include <sched.h> +]]) + AC_ARG_ENABLE([most-builds], AS_HELP_STRING([--enable-most-builds], [build everthing other than experimental code]), @@ -487,10 +520,6 @@ UL_REQUIRES_BUILD([mountpoint], [libmount]) AM_CONDITIONAL(BUILD_MOUNTPOINT, test "x$build_mountpoint" = xyes) -UL_CHECK_LIB(util, openpty) -UL_CHECK_LIB(termcap, tgetnum) - - AC_ARG_WITH([ncurses], AS_HELP_STRING([--with-ncurses], [build with non-wide ncurses, default is wide version (--without-ncurses disables all ncurses(w) support)]), @@ -597,27 +626,6 @@ char *c = crypt("abc","pw"); AM_CONDITIONAL(NEED_LIBCRYPT, test "x$need_libcrypt" = xyes) -AC_CHECK_TYPES([union semun], [], [], [[ -#include <sys/sem.h> -]]) -AC_CHECK_TYPES(loff_t) - - -AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ -#include <wchar.h> -#include <wctype.h> -#include <stdio.h> -]], [[ - wchar_t wc; - wint_t w; - w = fgetwc(stdin); - if (w == WEOF) exit(1); - wc = w; - fputwc(wc,stdout); -]])], -[AC_DEFINE(HAVE_WIDECHAR,1,Do we have wide character support?) -]) - UL_CHECK_SYSCALL([pivot_root]) UL_CHECK_SYSCALL([sched_getaffinity]) @@ -727,16 +735,6 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM( ]) -AC_CHECK_TYPES([cpu_set_t], [have_cpu_set_t=yes], [], [[ -#include <sched.h> -]]) - -AM_CONDITIONAL(HAVE_CPU_SET_T, [test "x$have_cpu_set_t" = xyes]) - -AC_CHECK_DECLS([CPU_ALLOC], [], [], [[ -#include <sched.h> -]]) - UL_SET_ARCH(I86, i?86-*) UL_SET_ARCH(86_64, x86_64*) UL_SET_ARCH(IA64, ia64*) |