sendKillSequence(): added
[util-vserver.git] / util-vserver / configure.ac
index e02efe3..a3a475d 100644 (file)
@@ -24,93 +24,122 @@ dnl distribution terms that you use for the rest of that program.
 dnl  
 
 AC_PREREQ(2.57)
-AC_INIT(util-vserver, 0.23.89.1, enrico.scholz@informatik.tu-chemnitz.de)
+AC_INIT(util-vserver, 0.26.195, enrico.scholz@informatik.tu-chemnitz.de)
 AC_CONFIG_SRCDIR([src/capchroot.c])
 AC_CONFIG_HEADER([config.h])
 
-AM_INIT_AUTOMAKE([gnu dist-bzip2 subdir-objects])
+AM_INIT_AUTOMAKE([gnits dist-bzip2 subdir-objects])
 AM_MAINTAINER_MODE
 
-AC_SUBST(CVS2CL_TAG, [])
-
 # Checks for programs.
 AC_PROG_CXX
 AC_PROG_CC
 AC_PROG_INSTALL
 AC_PROG_LN_S
-AC_PROG_RANLIB
+dnl AC_PROG_RANLIB
+AC_PROG_LIBTOOL
 AM_PROG_CC_C_O
+ENSC_CXXCOMPILER
 
 check_paths=$PATH:/sbin:/usr/sbin:/usr/local/sbin
-AC_PATH_PROGS(AWK,     [awk],     [awk],     [ $check_paths ])
-AC_PATH_PROGS(GREP,    [grep],    [grep],    [ $check_paths ])
-AC_PATH_PROGS(IP,      [ip],      [ip],      [ $check_paths ])
-AC_PATH_PROGS(MOUNT,   [mount],   [mount],   [ $check_paths ])
-AC_PATH_PROGS(NICE,    [nice],    [nice],    [ $check_paths ])
-AC_PATH_PROGS(VCONFIG, [vconfig], [vconfig], [ $check_paths ])
-AC_PATH_PROGS(WC,      [wc],      [wc],      [ $check_paths ])
-
-AC_CHECK_PROGS(CVS2CL, [cvs2cl])
-AM_CONDITIONAL(HAVE_CVS2CL,  [test x"$CVS2CL" != x])
-
-ENSC_CHECK_CC_FLAG([-std=c99])
-
-AC_MSG_CHECKING([whether to enable dietlibc])
-AC_ARG_ENABLE([dietlibc],
-             [AC_HELP_STRING([--disable-dietlibc],
-                             [do not use dietlibc (default: use dietlibc)])],
-             [case "$withval" in
-                 yes)  use_dietlibc=forced;;
-                 no)   use_dietlibc=forced_no;;
-                 *)    AC_MSG_ERROR(['$withval' is not a valid value for --enable-dietlibc]);;
-              esac],
-             [: ${DIET:=diet}
-              which "$DIET" >/dev/null 2>/dev/null && use_dietlibc=detected || use_dietlibc=detected_no])
-
-case x"$use_dietlibc" in
-    xdetected)
-       AM_CONDITIONAL(USE_DIETLIBC, true)
-       AC_MSG_RESULT([yes (autodetected)])
-       ;;
-    xforced)
-       AM_CONDITIONAL(USE_DIETLIBC, true)
-       AC_MSG_RESULT([yes (forced)])
-       ;;
-    xdetected_no)
-       AM_CONDITIONAL(USE_DIETLIBC, false)
-       AC_MSG_RESULT([no (detected)])
-       ;;
-    xforced_no)
-       AM_CONDITIONAL(USE_DIETLIBC, false)
-       AC_MSG_RESULT([no (forced)])
-       ;;
-    *)
-       AC_MSG_ERROR([internal error, use_dietlibc was "$use_dietlibc"])
-       ;;
-esac
+AC_PATH_PROGS(AWK,     [awk],     [awk],         [ $check_paths ])
+AC_PATH_PROGS(GREP,    [grep],    [grep],        [ $check_paths ])
+AC_PATH_PROGS(IP,      [ip],      [ip],          [ $check_paths ])
+AC_PATH_PROGS(MOUNT,   [mount],   [/bin/mount],  [ $check_paths ])
+AC_PATH_PROGS(UMOUNT,  [umount],  [/bin/umount], [ $check_paths ])
+AC_PATH_PROGS(NICE,    [nice],    [nice],        [ $check_paths ])
+AC_PATH_PROGS(VCONFIG, [vconfig], [vconfig],     [ $check_paths ])
+AC_PATH_PROGS(WC,      [wc],      [wc],          [ $check_paths ])
+
+
+ENSC_CHECK_CC_FLAG([-std=c99 -Wall -pedantic -W])
+ENSC_CHECK_CXX_FLAG([-ansi   -Wall -pedantic -W -fmessage-length=0])
+
+ENSC_FPIC_SYSCALL
+
+
+AC_MSG_CHECKING([whether to enable debug-code in library])
+AC_ARG_ENABLE([lib-debug],
+             [AC_HELP_STRING([--enable-lib-debug],
+                              [enable additional debug code in library (default: no)])],
+              [case "$enableval" in
+                 yes)  use_lib_debug=1;;
+                  no)   use_lib_debug=;;
+                  *)    AC_MSG_ERROR(['$enableval' is not a valid value for '--enable-lib-debug']);;
+               esac],
+              [ use_lib_debug= ])
+
+if test x"$use_lib_debug" = x; then
+       AC_SUBST(LIB_DEBUG_CPPFLAGS, [-DNDEBUG])
+       AC_MSG_RESULT(no)
+else
+       AC_SUBST(LIB_DEBUG_CPPFLAGS, [])
+       AC_MSG_RESULT(yes)
+fi
 
 AC_ARG_VAR(CC, [The C compiler])
-AC_MSG_CHECKING([for linux kernel headers])
-AC_ARG_WITH([kerneldir],
-           [AC_HELP_STRING([--with-kerneldir=DIR],
-                            [assume top-kernelsources in DIR (default: /lib/modules/<current>/build)])],
-            [case "$withval" in
-               yes|no) AC_MSG_ERROR(['$withval' is not a valid value for kerneldir]);;
-               *)      kerneldir=$withval;;
-            esac],
-           [kerneldir=
-            for i in /lib/modules/$(uname -r)/build /usr/src/linux /usr; do
-               test -e $i/include/linux/version.h && { kerneldir=$i; break; }
-            done])
-
-test "$kerneldir" -a -e $i/include/linux/version.h || {
-       AC_MSG_ERROR([Can not find kernelsources])
-}
-
-kernelincludedir=$kerneldir/include
-AC_SUBST(kernelincludedir)
-AC_MSG_RESULT($kernelincludedir/linux)
-               
 
+ENSC_INITRDDIR(initrddir)
+ENSC_RELEASE(RELEASE_CPPFLAGS)
+ENSC_ENABLE_DIETLIBC(USE_DIETLIBC)
+ENSC_KERNEL_HEADERS(kernelincludedir)
+ENSC_UV_VROOTDIR(vserverdir)
+ENSC_CHANGELOG([HEAD])
+
+dnl Check whether to use external kernel headers
+AC_MSG_CHECKING([whether to use internal kernel headers])
+AC_ARG_ENABLE([internal-headers],
+              [AC_HELP_STRING([--disable-internal-headers],
+                              [use vserver specific headers from the kernel instead of the shipped versions (default: no)])],
+              [case "$enableval" in
+                 yes|no) ;;
+                 *)      AC_MSG_ERROR(['$i' is not a supported value for '--disable-internal-headers']);;
+              esac],
+              [enable_internal_headers=yes])
+
+AM_CONDITIONAL(ENSC_ENABLE_INTERNAL_HEADERS, [test x"$enable_internal_headers" = xyes])
+AC_MSG_RESULT([$enable_internal_headers])
+
+
+dnl Check for the APIs to be used
+AC_MSG_CHECKING([for supported APIs])
+AC_ARG_ENABLE([apis],
+             [AC_HELP_STRING([--enable-apis=APIS],
+                             [enable support for the given apis; possible values are: legacy,compat,v11,ALL (default: ALL)])],
+              [],
+             [enable_apis=ALL])
+
+test x"$enable_apis" != xALL || enable_apis='legacy,compat,v11'
+old_IFS=$IFS
+IFS=,;
+for i in $enable_apis; do
+       case "$i" in
+               compat) AC_DEFINE(VC_ENABLE_API_COMPAT, 1, [Enable support for compatibily syscall API]);;
+               legacy) AC_DEFINE(VC_ENABLE_API_LEGACY, 1, [Enable support for old, /proc parsing API]);;
+               v11)    AC_DEFINE(VC_ENABLE_API_V11,    1, [Enable support for API of vserver 1.1.x]);;
+               *)      AC_MSG_ERROR(['$i' is not a supported API]);;
+       esac
+done
+IFS=$old_IFS
+AC_MSG_RESULT([$enable_apis])
+
+AC_LANG_PUSH(C++)
+AC_CHECK_HEADERS([ext2fs/ext2fs.h], [],
+  [AC_CHECK_HEADERS([linux/ext2_fs.h], [],
+                    [AC_MSG_ERROR([Sorry, do not know, how to include 'ext2fs.h'])])])
+AC_LANG_POP
+
+AC_CHECK_FUNCS([vserver])
+AC_CHECK_DECLS(MS_MOVE,,,[#include <linux/fs.h>])
+AC_CHECK_TYPES(xid_t,,,[#include <sys/types.h>])
+
+dnl BIG HACK! Do some autodetection here!
+AC_DEFINE(UTMP_GID, [22], [The utmp gid-number])
+
+if false; then
+       AC_DEFINE(HAVE_GROWING_STACK, [1], [Define to 1 if the stack is on growing addresses])
+fi
+
+AH_BOTTOM([#include "compat.h"])
 AC_CONFIG_FILES([util-vserver.spec Makefile distrib/Makefile])
 AC_OUTPUT