backing out to version 208 of util-vserver

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

diff --git a/m4/ensc_syscallnr.m4 b/m4/ensc_syscallnr.m4
index db6efb3..868ca38 100644 (file)
--- a/m4/ensc_syscallnr.m4
+++ b/m4/ensc_syscallnr.m4
@@ -1,4 +1,4 @@
-dnl $Id: ensc_syscallnr.m4 2187 2005-10-28 16:01:19Z ensc $
+dnl $Id: ensc_syscallnr.m4,v 1.6 2004/03/08 19:55:28 ensc Exp $
 
 dnl Copyright (C) 2004 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
 dnl  
@@ -15,22 +15,19 @@ dnl You should have received a copy of the GNU General Public License
 dnl along with this program; if not, write to the Free Software
 dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-dnl Usage: ENSC_SYSCALLNR(<syscall>,<default>[,<fallback>])
+dnl Usage: ENSC_SYSCALLNR(<syscall>,<default>)
 
 AC_DEFUN([ENSC_SYSCALLNR],
 [
        AC_REQUIRE([AC_PROG_CPP])
        AC_REQUIRE([AC_PROG_EGREP])
+       AC_REQUIRE([ENSC_KERNEL_HEADERS])
 
        AC_CACHE_CHECK([for number of syscall '$1'], [ensc_cv_value_syscall_$1],
        [
                AC_LANG_PUSH(C)
                AC_LANG_CONFTEST([
-#ifdef ENSC_SYSCALL_FALLBACK
-#  include ENSC_SYSCALL_FALLBACK
-#else
-#  include <asm/unistd.h>
-#endif
+#include <asm/unistd.h>
 #ifdef __NR_$1
 ensc_syscall_tmp_nr=__NR_$1;
 ensc_syscall_tmp_src=ENSC_MARK
@@ -38,10 +35,10 @@ ensc_syscall_tmp_src=ENSC_MARK
 ])
                ensc_syscall_tmp_nr=
                ensc_syscall_tmp_src=
-               test x"$ensc_syscall_tmp_nr" != x || \
-                       eval $($CPP $CPPFLAGS -D ENSC_MARK='glibc'                                    conftest.c | $EGREP '^ensc_syscall_tmp_(nr=[[1-9]][[0-9]]*;|src=.*)$')
-               test x"$ensc_syscall_tmp_nr" != x -o x'$3' = x || \
-                       eval $($CPP $CPPFLAGS -D ENSC_MARK='fallback' -D ENSC_SYSCALL_FALLBACK='"$3"' conftest.c | $EGREP '^ensc_syscall_tmp_(nr=[[1-9]][[0-9]]*;|src=.*)$')
+               test "$ensc_syscall_tmp_nr" || \
+                       eval $($CPP $CPPFLAGS -D ENSC_MARK='glibc'                                 conftest.c | $EGREP '^ensc_syscall_tmp_(nr=[[1-9]][[0-9]]*;|src=.*)$')
+               test "$ensc_syscall_tmp_nr" || \
+                       eval $($CPP $CPPFLAGS -D ENSC_MARK='kernel' -I $ensc_cv_path_kernelheaders conftest.c | $EGREP '^ensc_syscall_tmp_(nr=[[1-9]][[0-9]]*;|src=.*)$')
                test "$ensc_syscall_tmp_nr" || {
                        ensc_syscall_tmp_nr=$2
                        ensc_syscall_tmp_src=default