minor optimizations
[util-vserver.git] / util-vserver / m4 / ensc_syscallnr.m4
index 4b90953..aaa1959 100644 (file)
@@ -19,6 +19,7 @@ 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])
 
@@ -35,9 +36,9 @@ ensc_syscall_tmp_src=ENSC_MARK
                ensc_syscall_tmp_nr=
                ensc_syscall_tmp_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=.*)$')
+                       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 $kernelincludedir conftest.c | $EGREP '^ensc_syscall_tmp_(nr=[[1-9]][[0-9]]*;|src=.*)$')
+                       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
@@ -45,7 +46,7 @@ ensc_syscall_tmp_src=ENSC_MARK
 
                if test x"$ensc_syscall_tmp_nr" = x; then
                        AC_MSG_ERROR(
-[Can not determine value of __NR_$1; please verify your glibc/kernelheaders, and/or set CPPFLAGS='-D=__NR_$1=<value>' environment when calling configure.])
+[Can not determine value of __NR_$1; please verify your glibc/kernelheaders, and/or set CPPFLAGS='-D__NR_$1=<value>' environment when calling configure.])
                fi
                AC_LANG_POP