do not use the local kernelheaders anymore; this causes problems on
authorEnrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
Fri, 28 Oct 2005 16:00:10 +0000 (16:00 +0000)
committerEnrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
Fri, 28 Oct 2005 16:00:10 +0000 (16:00 +0000)
cross-compiling

git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@2186 94cd875c-1c1d-0410-91d2-eb244daf1a30

util-vserver/Makefile.am
util-vserver/configure.ac
util-vserver/lib/syscall.c
util-vserver/m4/ensc_kerneldir.m4 [deleted file]
util-vserver/m4/ensc_syscall.m4

index 649babb..8adb41e 100644 (file)
@@ -53,7 +53,7 @@ sysconf_DATA =
 
 DIETPROGS =            $(LIBENSCVECTOR_DIET)
 
-BUILT_SOURCES =                pathconfig.h linuxvirtual.h \
+BUILT_SOURCES =                pathconfig.h \
                        .fixups
 
 man_MANS =
@@ -138,15 +138,6 @@ silent.%:          FORCE
                        exec 2>$$t/fifo && \
                        $(MAKE) '$*' -s >/dev/null
 
-
-linuxvirtual.h:
-if ENSC_ENABLE_INTERNAL_HEADERS
-                       ln -sf '$(top_srcdir)/lib/virtual.h' '$@'
-else
-                       ln -sf '$(kernelincludedir)/linux/virtual.h' '$@' && test -e '$@' || \
-                       ln -sf '$(top_srcdir)/lib/virtual.h' '$@'
-endif
-
 pathsubst_RULES =      s!@'PKGLIBDIR'@!$(pkglibdir)!g; \
                        s!@'LEGACYDIR'@!$(legacydir)!g; \
                        s!@'SBINDIR'@!$(sbindir)!g; \
index 1f1e1ed..b577ce4 100644 (file)
@@ -173,7 +173,6 @@ dnl
 dnl ##########################
 
 
-ENSC_KERNEL_HEADERS(kernelincludedir)
 ENSC_UV_VROOTDIR(vserverdir)
 ENSC_CHANGELOG([trunk])
 
@@ -251,7 +250,7 @@ dnl
 dnl ##########################
 
 
-ENSC_SYSCALLNR(vserver,273)
+ENSC_SYSCALLNR(vserver,273,[lib/syscall-fallback.h])
 ENSC_SYSCALL
 ENSC_CHECK_EXT2FS_HEADER
 AC_CHECK_FUNCS([vserver])
@@ -347,7 +346,6 @@ Paths:
             cfg-Directory: $sysconfdir/vservers
          initrd-Directory: $initrddir
        pkgstate-Directory: $localstatedir/run/vservers
-            Kernelheaders: $kernelincludedir
           vserver-Rootdir: $vserverdir
 "
                        echo "$FEATURES_TXT" >FEATURES.txt
index cde39e3..a892b2d 100644 (file)
@@ -25,7 +25,7 @@
 #include "internal.h"
 
 #define _LINUX_TYPES_H 1
-#include "linuxvirtual.h"
+#include "virtual.h"
 
 #if defined(VC_ENABLE_API_COMPAT) && defined(VC_ENABLE_API_LEGACY)
 #  define VC_MULTIVERSION_SYSCALL      1
diff --git a/util-vserver/m4/ensc_kerneldir.m4 b/util-vserver/m4/ensc_kerneldir.m4
deleted file mode 100644 (file)
index 8555e67..0000000
+++ /dev/null
@@ -1,57 +0,0 @@
-dnl $Id$
-
-dnl Copyright (C) 2002 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
-dnl  
-dnl This program is free software; you can redistribute it and/or modify
-dnl it under the terms of the GNU General Public License as published by
-dnl the Free Software Foundation; version 2 of the License.
-dnl  
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-dnl GNU General Public License for more details.
-dnl  
-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_KERNEL_HEADERS(<var>)
-dnl        <var> ... basedir of kernel-headers (without the '/linux');
-dnl                  this value will be AC_SUBST'ed
-
-AC_DEFUN([_ENSC_KERNEL_DIR],
-[
-       AC_CACHE_CHECK([for linux kernel dir], [ensc_cv_path_kerneldir],
-        [
-AC_ARG_WITH([kerneldir],
-           [AC_HELP_STRING([--with-kerneldir=DIR],
-                           [assume kernelsources in DIR (default: /lib/modules/<current>/build)])],
-            [case "$withval" in
-               yes|no) AC_MSG_ERROR(['$withval' is not a valid value for kerneldir]);;
-               *)      ensc_cv_path_kerneldir=$withval;;
-            esac],
-           [ensc_cv_path_kerneldir=
-            for i in /lib/modules/$(uname -r)/build /usr/src/linux /usr; do
-               test -e $i/include/linux/version.h && { ensc_cv_path_kerneldir=$i; break; }
-            done])
-       ])
-
-       test "$ensc_cv_path_kerneldir" -a -e "$ensc_cv_path_kerneldir"/include/linux/version.h || {
-               AC_MSG_ERROR([Can not find kernelsources])
-       }
-])
-
-AC_DEFUN([ENSC_KERNEL_HEADERS],
-[
-       AC_REQUIRE([_ENSC_KERNEL_DIR])
-
-       AC_CACHE_CHECK([for linux kernel headers], [ensc_cv_path_kernelheaders],
-       [
-               ensc_cv_path_kernelheaders=$ensc_cv_path_kerneldir/include
-       ])
-
-       if test x"$1" != x; then
-               $1=$ensc_cv_path_kernelheaders
-               AC_SUBST($1)
-       fi
-])
index 57b1c8e..c2cef71 100644 (file)
@@ -39,7 +39,6 @@ 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])