dnl
AC_PREREQ(2.57)
-AC_INIT(util-vserver, 0.29.210, enrico.scholz@informatik.tu-chemnitz.de)
+AC_INIT(util-vserver, 0.30.196, enrico.scholz@informatik.tu-chemnitz.de)
AC_CONFIG_SRCDIR([src/capchroot.c])
AC_CONFIG_HEADER([config.h])
-AM_INIT_AUTOMAKE([gnits dist-bzip2 subdir-objects])
+AM_INIT_AUTOMAKE([1.9 gnits dist-bzip2 subdir-objects])
AM_MAINTAINER_MODE
+AC_SUBST(GPG_KEY, "0x7AE5D4B5922F7AF9!")
+
# Checks for programs.
AC_PROG_CXX
AC_PROG_CC
ENSC_CXXCOMPILER
ENSC_C99COMPILER
-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], [/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 ])
-AC_PATH_PROGS(PS, [ps], [/bin/ps], [ $check_paths ])
-AC_PATH_PROGS(MODPROBE, [modprobe], [/sbin/modprobe], [ $check_paths ])
-AC_PATH_PROGS(RMMOD, [rmmod], [/sbin/rmmod], [ $check_paths ])
-AC_PATH_PROGS(NAMEIF, [nameif], [/sbin/nameif], [ $check_paths ])
-AC_PATH_PROGS(IPTABLES, [iptables], [/sbin/iptables], [ $check_paths ])
-AC_PATH_PROGS(SED, [sed], [sed])
-AC_PATH_PROGS(CMP, [cmp], [cmp])
-AC_PATH_PROGS(WGET, [wget], [wget])
-AC_PATH_PROGS(DOXYGEN, [doxygen], [:])
-AC_PATH_PROGS(TAR, [tar])
-AC_PATH_PROGS(XSLTP, [xsltp])
-
-AM_CONDITIONAL(HAVE_XSLTP, test "$XSLTP")
+ENSC_SET_SEARCHPATH([$PATH:/sbin:/usr/sbin:/usr/local/sbin])
+ENSC_PATHPROG_STANDARD_TOOLS
+
+ENSC_PATHPROG(IP, ip)
+ENSC_PATHPROG(IPTABLES, iptables)
+ENSC_PATHPROG(MODPROBE, modprobe)
+ENSC_PATHPROG(NAMEIF, nameif)
+ENSC_PATHPROG(RMMOD, rmmod)
+ENSC_PATHPROG(VCONFIG, vconfig)
+ENSC_PATHPROG(WGET, wget)
+
+ENSC_PATHPROG(DOXYGEN, doxygen, [:])
+ENSC_PATHPROG(XSLTP, xsltp, [:])
+ENSC_PATHPROG(XSLTPROC, xsltproc, [:])
+
+
+AM_CONDITIONAL(HAVE_XSLTP, test "$XSLTP" != ':')
ENSC_CHECK_CC_FLAG([-std=c99 -Wall -pedantic -W])
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,v13,fscompat,ALL (default: ALL)])],
+ [enable support for the given apis; possible values are: legacy,compat,v11,v13,fscompat,net,ALL (default: all except 'legacy')])],
[],
- [enable_apis=ALL])
+ [enable_apis=compat,v11,v13,fscompat,net])
-test x"$enable_apis" != xALL || enable_apis='legacy,compat,v11,v13,fscompat'
+test x"$enable_apis" != xALL || enable_apis='legacy,compat,v11,v13,fscompat,net'
enable_api_oldproc=
enable_api_olduts=
old_IFS=$IFS
enable_api_olduts=1
;;
v13) AC_DEFINE(VC_ENABLE_API_V13, 1, [Enable support for API of vserver 1.3.x]);;
+ net) AC_DEFINE(VC_ENABLE_API_NET, 1, [Enable support for network context API]);;
fscompat) AC_DEFINE(VC_ENABLE_API_FSCOMPAT, 1, [Enable support for filesystem compatibility API]);;
*) AC_MSG_ERROR(['$i' is not a supported API]);;
esac
ensc_cxx_affected=" (affected: vbuild, vcheck)"
ensc_c99_affected=" (affected: vunify, vcopy)"
ensc_diet_msg=" (you have been warned)"
+ensc_diet_version_msg=" ($ensc_version_dietlibc)"
ensc_diet_compat_msg=" (using -lcompat)"
test x"$ensc_cv_cxx_cxxcompiler" = xno || ensc_cxx_affected=
test x"$ensc_cv_c99_c99compiler" = xno || ensc_c99_affected=
test x"$ensc_have_dietlibc" = xno || ensc_diet_msg=
+test x"$ensc_version_dietlibc" != x || ensc_diet_version_msg=
test x"$ensc_have_dietlibc$ensc_cv_c_dietlibc_compat" = xyesyes || ensc_diet_compat_msg=
AH_BOTTOM([#include "compat.h"])
CFLAGS: '$CFLAGS'
CXXFLAGS: '$CXXFLAGS'
build/host: $build/$host
- Use dietlibc: $ensc_have_dietlibc$ensc_diet_msg$ensc_diet_compat_msg
+ Use dietlibc: $ensc_have_dietlibc$ensc_diet_version_msg$ensc_diet_msg$ensc_diet_compat_msg
Build C++ programs: $ensc_cv_cxx_cxxcompiler$ensc_cxx_affected
Build C99 programs: $ensc_cv_c99_c99compiler$ensc_c99_affected
Available APIs: $enable_apis