X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Fm4%2Fensc_syscall.m4;h=155bfbb41687dfd37db04235a858fb5394620a94;hb=b200c0071dac48ca1576123c8fd3d72052425127;hp=d1a24644739e3a447a5fd81e3d08f1483c4b49d1;hpb=981c2a0d7fc4df3a902bc24be306e37918c36ee4;p=util-vserver.git diff --git a/util-vserver/m4/ensc_syscall.m4 b/util-vserver/m4/ensc_syscall.m4 index d1a2464..155bfbb 100644 --- a/util-vserver/m4/ensc_syscall.m4 +++ b/util-vserver/m4/ensc_syscall.m4 @@ -24,8 +24,8 @@ AC_DEFUN([ENSC_SYSCALL_ALTERNATIVE], [AC_HELP_STRING([--disable-alternative-syscalls], [do not use the alternative _syscallX macros provided by Herbert Poetzl (default: use them)])], - [case $enable_val in - (yes|no) ensc_use_alternative_syscall_macros=$enable_val;; + [case $enableval in + (yes|no) ensc_use_alternative_syscall_macros=$enableval;; (*) AC_MSG_ERROR(['$enableval' is not a valid value for '--disable-alternative-syscalls']);; esac], [ensc_use_alternative_syscall_macros=yes]) @@ -39,8 +39,8 @@ AC_DEFUN([ENSC_SYSCALL_ALTERNATIVE], AC_DEFUN([ENSC_SYSCALL], [ - AC_REQUIRE([ENSC_KERNEL_HEADERS]) AC_REQUIRE([ENSC_SYSCALL_ALTERNATIVE]) + AC_MSG_CHECKING([for syscall(2) invocation method]) AC_ARG_WITH([syscall], [AC_HELP_STRING([--with-syscall=METHOD], @@ -57,6 +57,7 @@ AC_DEFUN([ENSC_SYSCALL], AC_COMPILE_IFELSE(AC_LANG_SOURCE([ #include "$srcdir/lib/syscall-wrap.h" #include + #define __NR_foo0 300 #define __NR_foo1 301 #define __NR_foo2 302 @@ -102,7 +103,7 @@ int main() { fi AH_BOTTOM([ -#if defined(__pic__) && defined(__i386) && !defined(ENSC_SYSCALL_TRADITIONAL) +#if defined(__pic__) && defined(__i386) && !defined(ENSC_SYSCALL_TRADITIONAL) && !defined(ENSC_USE_ALTERNATIVE_SYSCALL_MACROS) # define ENSC_SYSCALL_TRADITIONAL 1 #endif]) ])