use new ensc_wrappers/ headers
[util-vserver.git] / util-vserver / configure.ac
index 8f6afd3..79d2a68 100644 (file)
@@ -24,7 +24,7 @@ dnl distribution terms that you use for the rest of that program.
 dnl  
 
 AC_PREREQ(2.57)
-AC_INIT(util-vserver, 0.27.199, enrico.scholz@informatik.tu-chemnitz.de)
+AC_INIT(util-vserver, 0.28.195, enrico.scholz@informatik.tu-chemnitz.de)
 AC_CONFIG_SRCDIR([src/capchroot.c])
 AC_CONFIG_HEADER([config.h])
 
@@ -40,6 +40,7 @@ dnl AC_PROG_RANLIB
 AC_PROG_LIBTOOL
 AM_PROG_CC_C_O
 ENSC_CXXCOMPILER
+ENSC_C99COMPILER
 
 check_paths=$PATH:/sbin:/usr/sbin:/usr/local/sbin
 AC_PATH_PROGS(AWK,     [awk],     [awk],         [ $check_paths ])
@@ -51,8 +52,10 @@ 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_PATH_PROGS(PS,      [ps],      [/bin/ps],     [ $check_paths ])
-AC_PATH_PROGS(XSLTPROC, [xsltproc], [xsltproc],  [ $check_paths ])
-
+AC_PATH_PROGS(XSLTPROC, [xsltproc], [xsltproc])
+AC_PATH_PROGS(SED,      [sed],      [sed])
+AC_PATH_PROGS(CMP,      [cmp],      [cmp])
+AC_PATH_PROGS(WGET,     [wget],     [wget])
 
 ENSC_CHECK_CC_FLAG([-std=c99 -Wall -pedantic -W])
 ENSC_CHECK_CXX_FLAG([-ansi   -Wall -pedantic -W -fmessage-length=0])
@@ -113,16 +116,23 @@ AC_ARG_ENABLE([apis],
 
 test x"$enable_apis" != xALL || enable_apis='legacy,compat,v11,v13,fscompat'
 enable_api_oldproc=
+enable_api_olduts=
 old_IFS=$IFS
 IFS=,;
 for i in $enable_apis; do
        case "$i" in
                compat)         AC_DEFINE(VC_ENABLE_API_COMPAT,   1, [Enable support for compatibility syscall API])
-                               enable_api_oldproc=1;;
+                               enable_api_oldproc=1
+                               enable_api_olduts=1
+                               ;;
                legacy)         AC_DEFINE(VC_ENABLE_API_LEGACY,   1, [Enable support for old, /proc parsing API])
-                               enable_api_old_proc=1;;
+                               enable_api_old_proc=1
+                               enable_api_olduts=1
+                               ;;
                v11)            AC_DEFINE(VC_ENABLE_API_V11,      1, [Enable support for API of vserver 1.1.x])
-                               enable_api_oldproc=1;;
+                               enable_api_oldproc=1
+                               enable_api_olduts=1
+                               ;;
                v13)            AC_DEFINE(VC_ENABLE_API_V13,      1, [Enable support for API of vserver 1.3.x]);;
                fscompat)       AC_DEFINE(VC_ENABLE_API_FSCOMPAT, 1, [Enable support for filesystem compatibility API]);;
                *)              AC_MSG_ERROR(['$i' is not a supported API]);;
@@ -133,14 +143,14 @@ if test x"$enable_api_oldproc" != x; then
        AC_DEFINE(VC_ENABLE_API_OLDPROC, 1, [Enable API for a backward compatible /proc parsing])
        enable_apis="$enable_apis,oldproc"
 fi
+if test x"$enable_api_olduts" != x; then
+       AC_DEFINE(VC_ENABLE_API_OLDUTS, 1, [Enable API for a backward compatible uts handling])
+       enable_apis="$enable_apis,olduts"
+fi
 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
-
+ENSC_SYSCALL
+ENSC_CHECK_EXT2FS_HEADER
 AC_CHECK_FUNCS([vserver])
 AC_CHECK_DECLS(MS_MOVE,,,[#include <linux/fs.h>])
 AC_CHECK_TYPES(xid_t,,,[#include <sys/types.h>])
@@ -155,3 +165,35 @@ fi
 AH_BOTTOM([#include "compat.h"])
 AC_CONFIG_FILES([util-vserver.spec Makefile distrib/Makefile])
 AC_OUTPUT
+
+ensc_cxx_affected=
+ensc_c99_affected=
+test x"$ensc_cv_cxx_cxxcompiler" = xyes || ensc_cxx_affected=" (affected: vbuild, vcheck)"
+test x"$ensc_cv_c99_c99compiler" = xyes || ensc_c99_affected=" (affected: vunify)"
+
+AC_MSG_NOTICE([
+
+$PACKAGE_STRING
+
+Features:
+                      CC: $CC, $($CC   --version | sed -e '1p;d')
+                      CXX: $CXX, $($CXX --version | sed -e '1p;d')
+                 CPPFLAGS: '$CPPFLAGS'
+                   CFLAGS: '$CFLAGS'
+                 CXXFLAGS: '$CXXFLAGS'
+               build/host: $build/$host
+             Use dietlibc: $ensc_have_dietlibc
+       Build C++ programs: $ensc_cv_cxx_cxxcompiler$ensc_cxx_affected
+       Build C99 programs: $ensc_cv_c99_c99compiler$ensc_c99_affected
+           Available APIs: $enable_apis
+            ext2fs Source: $ensc_cv_test_ext2fs_header
+    syscall(2) invocation: $with_syscall
+   
+Paths:
+                   prefix: $prefix
+        sysconf-Directory: $sysconfdir
+            cfg-Directory: $sysconfdir/vservers
+         initrd-Directory: $initrddir
+            Kernelheaders: $kernelincludedir
+          vserver-Rootdir: $vserverdir
+])