use unique identifiers
authorEnrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
Thu, 4 Mar 2004 03:00:42 +0000 (03:00 +0000)
committerEnrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
Thu, 4 Mar 2004 03:00:42 +0000 (03:00 +0000)
git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@1052 94cd875c-1c1d-0410-91d2-eb244daf1a30

util-vserver/m4/ensc_cflags.m4
util-vserver/m4/ensc_dietlibc.m4
util-vserver/m4/ensc_dietlibc_compat.m4
util-vserver/m4/ensc_fpicsyscall.m4
util-vserver/m4/ensc_syscall.m4

index be7268c..92f546f 100644 (file)
@@ -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])
index 88e8e64..b13aea1 100644 (file)
@@ -21,8 +21,8 @@ AC_DEFUN([_ENSC_DIETLIBC_C99],
 
        AC_CACHE_CHECK([whether dietlibc supports C99], [ensc_cv_c_dietlibc_c99],
        [
-               old_CFLAGS=$CFLAGS
-               old_CC=$CC
+               _ensc_dietlibc_c99_old_CFLAGS=$CFLAGS
+               _ensc_dietlibc_c99_old_CC=$CC
 
                CFLAGS="-std=c99"
                CC="${DIET:-diet} $CC"
@@ -42,8 +42,8 @@ AC_DEFUN([_ENSC_DIETLIBC_C99],
                        [ensc_cv_c_dietlibc_c99='skipped (compiler does not support C99)'])
                AC_LANG_POP
 
-               CC=$old_CC
-               CFLAGS=$old_CFLAGS
+               CC=$_ensc_dietlibc_c99_old_CC
+               CFLAGS=$_ensc_dietlibc_c99_old_CFLAGS
        ])
 
        if test x"$ensc_cv_c_dietlibc_c99" = xyes; then
index d65066f..fb7735f 100644 (file)
@@ -21,7 +21,7 @@ AC_DEFUN([ENSC_DIETLIBC_NEED_COMPAT],
        AC_CACHE_CHECK([whether dietlibc needs '-lcompat'], [ensc_cv_c_dietlibc_compat],
        [
                AC_LANG_PUSH(C)
-               old_CC=$CC
+               ensc_dietlibc_need_compat_old_CC=$CC
                CC="${DIET:-diet} $CC"
                AC_LINK_IFELSE([
                        AC_LANG_PROGRAM([
@@ -35,7 +35,7 @@ inline static _syscall0(int, foo)
                        [foo()])],
                        [ensc_cv_c_dietlibc_compat=no],
                        [ensc_cv_c_dietlibc_compat=yes])
-               CC=$old_CC
+               CC=$ensc_dietlibc_need_compat_old_CC
                AC_LANG_POP
        ])
 
index 41f172a..4cb11e3 100644 (file)
@@ -19,7 +19,7 @@ AC_DEFUN([ENSC_FPIC_SYSCALL],
 [
     AC_CACHE_CHECK([whether syscall() allows -fpic], [ensc_cv_c_fpic_syscall],
     [
-        old_CFLAGS=$CFLAGS
+        ensc_fpic_syscall_old_CFLAGS=$CFLAGS
         CFLAGS="-fPIC -DPIC"
 
        AC_LANG_PUSH(C)
@@ -34,7 +34,7 @@ AC_DEFUN([ENSC_FPIC_SYSCALL],
         [ensc_cv_c_fpic_syscall=yes], [ensc_cv_c_fpic_syscall=no])
        AC_LANG_POP
 
-        CFLAGS=$old_CFLAGS
+        CFLAGS=$ensc_fpic_syscall_old_CFLAGS
     ])
     
     AM_CONDITIONAL(ENSC_ALLOW_FPIC_WITH_SYSCALL, [test x"$ensc_cv_c_fpic_syscall" = xyes])
index 7c03511..a8026ce 100644 (file)
@@ -32,8 +32,6 @@ AC_DEFUN([ENSC_SYSCALL],
             xauto)
                AC_CACHE_CHECK([which syscall(2) invocation works], [ensc_cv_test_syscall],
                               [
-                               old_CPPFLAGS=$CPPFLAGS
-                               CPPFLAGS="-I$ensc_cv_path_kernelheaders"
                                AC_LANG_PUSH(C)
                                AC_COMPILE_IFELSE([
 #include <asm/unistd.h>
@@ -65,7 +63,6 @@ int main() {
                                [ensc_cv_test_syscall=traditional])
 
                                AC_LANG_POP
-                               CPPFLAGS=$old_CPPFLAGS
                ])
                with_syscall=$ensc_cv_test_syscall
                ;;