diff options
| author | Karel Zak | 2012-07-16 15:48:43 +0200 |
|---|---|---|
| committer | Karel Zak | 2012-07-16 15:48:43 +0200 |
| commit | bdf5f542e2af3d42973170fd18b917c69a9eccc1 (patch) | |
| tree | 281a116758f326f5871f34082fb983ee8bcc3eef | |
| parent | libmount: rename mnt_context_fstab_applied to mnt_context_tab_applied (diff) | |
| download | kernel-qcow2-util-linux-bdf5f542e2af3d42973170fd18b917c69a9eccc1.tar.gz kernel-qcow2-util-linux-bdf5f542e2af3d42973170fd18b917c69a9eccc1.tar.xz kernel-qcow2-util-linux-bdf5f542e2af3d42973170fd18b917c69a9eccc1.zip | |
build-sys: add UL_PROG_CLANG function, rename warnings.m4 -> compiler.m4
Signed-off-by: Karel Zak <kzak@redhat.com>
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | m4/compiler.m4 (renamed from m4/warnings.m4) | 28 |
3 files changed, 30 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore index 76da76351..2c3cc3eec 100644 --- a/.gitignore +++ b/.gitignore @@ -53,7 +53,7 @@ config/ltmain.sh # util-linux specific macros !m4/ul.m4 -!m4/warnings.m4 +!m4/compiler.m4 # # binaries diff --git a/configure.ac b/configure.ac index cf62d64b7..ba63e4438 100644 --- a/configure.ac +++ b/configure.ac @@ -89,6 +89,7 @@ AC_SUBST([usrsbin_execdir]) usrlib_execdir='${exec_prefix}/'$libdirname AC_SUBST([usrlib_execdir]) + AM_PROG_CC_C_O AC_PROG_CC_STDC AC_GNU_SOURCE @@ -97,6 +98,8 @@ AC_C_CONST AC_C_VOLATILE AC_C_BIGENDIAN +UL_PROG_CLANG + dnl Compiler warnings UL_WARN_ADD([-Wextra]) UL_WARN_ADD([-Wno-missing-field-initializers]) diff --git a/m4/warnings.m4 b/m4/compiler.m4 index 33160a960..02e7af22a 100644 --- a/m4/warnings.m4 +++ b/m4/compiler.m4 @@ -1,11 +1,10 @@ -# warnings.m4 serial 5 dnl Copyright (C) 2008-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. dnl From Simon Josefsson -dnl -- derivated from coreutils +dnl -- derivated from coreutils m4/warnings.m4 # UL_AS_VAR_APPEND(VAR, VALUE) # ---------------------------- @@ -36,3 +35,28 @@ AS_VAR_IF(ul_Warn, [yes], AS_VAR_POPDEF([ul_Warn])dnl m4_ifval([$2], [AS_LITERAL_IF([$2], [AC_SUBST([$2])], [])])dnl ]) + + +# UL_PROG_CLANG +# ------------- +# Checks if compiler is clang, defines compiler_clang=yes if yes +AC_DEFUN([UL_PROG_CLANG], [ + AC_REQUIRE([AC_PROG_CC]) + AC_CACHE_CHECK([whether clang is in use], [ul_cv_clang], [ + case ${CC} in #( + *gcc*) ul_cv_clang=no ;; + *clang*) ul_cv_clang=yes ;; + *) AC_COMPILE_IFELSE([AC_LANG_SOURCE([int main() { + #ifdef __clang__ + return 0; + #else + #error The __clang__ was not defined + #endif + }])], + [ul_cv_clang=yes], + [ul_cv_clang=no] + ) ;; + esac + ]) + compiler_clang=$ul_cv_clang +]) |