From: Brian J. Murrell <brian@sun.com>
Date: Thu, 4 Mar 2010 16:58:05 +0000 (-0800)
Subject: b=20383 fix errant m4 "dnl" usage
X-Git-Tag: 1.10.0.38~1
X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=fea8d73ca26e491d311e0644b0f14fc31573d835;hp=e817ad5b75570e433a70228ce9226e910bc35188

b=20383 fix errant m4 "dnl" usage

Some dnl() usage seems to have been causing some errors in the resulting
configure script.

o=tappro
i=brian
i=adilger
---

diff --git a/build/autoconf/lustre-build-darwin.m4 b/build/autoconf/lustre-build-darwin.m4
index 6f1be34..eeb9393 100644
--- a/build/autoconf/lustre-build-darwin.m4
+++ b/build/autoconf/lustre-build-darwin.m4
@@ -16,7 +16,7 @@ AS_IF([AC_TRY_COMMAND(nm /mach | grep "[$1]" >/dev/null 2>/dev/null)],[
 	AC_DEFINE_UNQUOTED(AS_TR_CPP([HAVE_$ac_func])) $2
 ],[
 	AC_MSG_RESULT([no]) $3
-])dnl
+])
 done
 ])
 
diff --git a/build/autoconf/lustre-build-linux.m4 b/build/autoconf/lustre-build-linux.m4
index 17ec83e..840dc22 100644
--- a/build/autoconf/lustre-build-linux.m4
+++ b/build/autoconf/lustre-build-linux.m4
@@ -343,7 +343,7 @@ rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
 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_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build) >/dev/null && AC_TRY_COMMAND([$3])],
 	[$4],
 	[_AC_MSG_LOG_CONFTEST
-m4_ifvaln([$5],[$5])dnl])dnl
+m4_ifvaln([$5],[$5])dnl])
 rm -f build/conftest.o build/conftest.mod.c build/conftest.mod.o build/conftest.ko m4_ifval([$1], [build/conftest.c conftest.c])[]dnl
 ])