merge with 0.30.213

[util-vserver.git] / m4 / ensc_cflags.m4

diff --git a/m4/ensc_cflags.m4 b/m4/ensc_cflags.m4
index 07098f8..926de9f 100644 (file)
--- a/m4/ensc_cflags.m4
+++ b/m4/ensc_cflags.m4
@@ -1,4 +1,4 @@
-dnl $Id: ensc_cflags.m4,v 1.1.4.1 2004/01/26 18:21:28 ensc Exp $
+dnl $Id: ensc_cflags.m4 1052 2004-03-04 03:00:42Z ensc $
 
 dnl Copyright (C) 2002 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
 dnl  
@@ -20,14 +20,14 @@ AC_DEFUN([__ENSC_CHECK_WARNFLAGS],
        warn_flags="-Werror -W"
        AC_MSG_CHECKING([whether the $1-compiler accepts ${warn_flags}])
        AC_LANG_PUSH($1)
-       old_CFLAGS="${$3}"
+       __ensc_check_warnflags_old_CFLAGS="${$3}"
        $3="$warn_flags"
        AC_TRY_COMPILE([inline static void f(){}],
                       [],
                       [ensc_sys_compilerwarnflags_$2=${warn_flags}],
                       [ensc_sys_compilerwarnflags_$2=])
        AC_LANG_POP($1)
-       $3="$old_CFLAGS"
+       $3="$__ensc_check_warnflags_old_CFLAGS"
 
        if test x"${ensc_sys_compilerwarnflags_$2}" = x; then
                AC_MSG_RESULT([no])
@@ -82,7 +82,8 @@ AC_DEFUN([ENSC_CHECK_CXX_FLAG],
 #  ENSC_CHECK_CC_FLAG(-flag1 -flag2 -flag3 ...)
 # -------------------------------------------------------------------------
 
-AC_DEFUN([ENSC_CHECK_CC_FLAG],[
+AC_DEFUN([ENSC_CHECK_CC_FLAG],
+[
        AC_REQUIRE([__ENSC_CHECK_WARNFLAGS_C])
 
 echo 'void f(){}' > conftest.c