From cf5b4ff87e7494fbc551ebd2c05d8ee5137dbcd9 Mon Sep 17 00:00:00 2001 From: Jeff Mahoney Date: Tue, 29 Apr 2014 22:58:52 -0400 Subject: [PATCH] LU-3953 build: fix AC_LANG_SOURCE autoconf warnings This fixes several places where the autoconf rules generate the following warning: configure.ac:23: warning: AC_LANG_CONFTEST: no AC_LANG_SOURCE call detected in body Signed-off-by: Jeff Mahoney Change-Id: Ib6a54310853b1e9aa34155e8bec9aae410278f25 Reviewed-on: http://review.whamcloud.com/10158 Tested-by: Jenkins Reviewed-by: Bob Glossman Reviewed-by: Andreas Dilger Reviewed-by: James Simmons Tested-by: Maloo Reviewed-by: Dmitry Eremin Reviewed-by: Oleg Drokin --- config/lustre-build-linux.m4 | 2 +- libcfs/autoconf/lustre-libcfs.m4 | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/config/lustre-build-linux.m4 b/config/lustre-build-linux.m4 index 8962587..ee009a4 100644 --- a/config/lustre-build-linux.m4 +++ b/config/lustre-build-linux.m4 @@ -538,7 +538,7 @@ $2 # $5 - do 'no' # AC_DEFUN([LB_LINUX_COMPILE_IFELSE], -[m4_ifvaln([$1], [AC_LANG_CONFTEST([$1])])dnl +[m4_ifvaln([$1], [AC_LANG_CONFTEST([AC_LANG_SOURCE([$1])])])dnl rm -f build/conftest.o build/conftest.mod.c build/conftest.ko SUBARCH=$(echo $target_cpu | sed -e 's/powerpc64/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/' -e 's/k1om/x86/') AS_IF([AC_TRY_COMMAND(cp conftest.c build && make -d [$2] ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_OFED_INCLUDE -I$LINUX/arch/$SUBARCH/include -I$LINUX/arch/$SUBARCH/include/generated -Iinclude -I$LINUX/include -Iinclude2 -I$LINUX/include/uapi -I$LINUX/include/generated -I$LINUX/arch/$SUBARCH/include/uapi -Iarch/$SUBARCH/include/generated/uapi -I$LINUX/include/uapi -Iinclude/generated/uapi ${SPL_OBJ:+-include $SPL_OBJ/spl_config.h} ${ZFS_OBJ:+-include $ZFS_OBJ/zfs_config.h} ${SPL:+-I$SPL -I$SPL/include } ${ZFS:+-I$ZFS -I$ZFS/include} -include $CONFIG_INCLUDE" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $CROSS_VARS $MODULE_TARGET=$PWD/build) >/dev/null && AC_TRY_COMMAND([$3])], diff --git a/libcfs/autoconf/lustre-libcfs.m4 b/libcfs/autoconf/lustre-libcfs.m4 index a73943b..dba971d 100644 --- a/libcfs/autoconf/lustre-libcfs.m4 +++ b/libcfs/autoconf/lustre-libcfs.m4 @@ -422,7 +422,7 @@ tmp_flags="$CFLAGS" CFLAGS="$CFLAGS -Werror" AC_CACHE_CHECK([if userspace '__u64' is 'long long' type], lb_cv_compile_userspace_u64_long_long, [ -AC_COMPILE_IFELSE([ +AC_COMPILE_IFELSE([AC_LANG_SOURCE([ #include #include #include @@ -433,7 +433,7 @@ AC_COMPILE_IFELSE([ data2 = data1; return 0; } -], +])], [lb_cv_compile_userspace_u64_long_long="yes"], [lb_cv_compile_userspace_u64_long_long="no"]) ]) -- 1.8.3.1