X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Fconfigure.ac;h=ea9d9a0f57471176d0ae30a1505069e8ffc19357;hb=68a4cdcaa9dbc6a451b8c29736133b25f9ef34b2;hp=577140b7ea37b8eb266b5ecf251335be75989806;hpb=756eed6bd5d780a9caf13d9c88687de50f4ce1d9;p=util-vserver.git diff --git a/util-vserver/configure.ac b/util-vserver/configure.ac index 577140b..ea9d9a0 100644 --- a/util-vserver/configure.ac +++ b/util-vserver/configure.ac @@ -24,13 +24,18 @@ dnl distribution terms that you use for the rest of that program. dnl AC_PREREQ(2.57) -AC_INIT(util-vserver, 0.29.200, enrico.scholz@informatik.tu-chemnitz.de) +AC_INIT(util-vserver, 0.30.201, 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_CANONICAL_BUILD +AC_CANONICAL_HOST + +AC_SUBST(GPG_KEY, "0x7AE5D4B5922F7AF9!") + # Checks for programs. AC_PROG_CXX AC_PROG_CC @@ -42,21 +47,24 @@ 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 ]) -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(XSLTPROC, [xsltproc], [xsltproc]) -AC_PATH_PROGS(SED, [sed], [sed]) -AC_PATH_PROGS(CMP, [cmp], [cmp]) -AC_PATH_PROGS(WGET, [wget], [wget]) -AC_PATH_PROGS(DOXYGEN, [doxygen], [:]) +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]) ENSC_CHECK_CXX_FLAG([-ansi -Wall -pedantic -W -fmessage-length=0]) @@ -87,7 +95,7 @@ AC_ARG_VAR(CC, [The C compiler]) ENSC_INITRDDIR(initrddir) ENSC_RELEASE(RELEASE_CPPFLAGS) -ENSC_ENABLE_DIETLIBC(USE_DIETLIBC) +ENSC_ENABLE_DIETLIBC(USE_DIETLIBC, [0.24]) if test x"$ensc_have_dietlibc" = xno; then AC_MSG_WARN([*** ***]) @@ -98,6 +106,7 @@ if test x"$ensc_have_dietlibc" = xno; then AC_MSG_WARN([*** ***]) AM_CONDITIONAL(USE_DIETLIBC_COMPAT, false) else + ENSC_DIETLIBC_SANITYCHECK ENSC_DIETLIBC_NEED_COMPAT(USE_DIETLIBC_COMPAT) fi @@ -125,11 +134,11 @@ 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,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 @@ -149,6 +158,7 @@ for i in $enable_apis; do 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 @@ -170,6 +180,9 @@ ENSC_CHECK_EXT2FS_HEADER AC_CHECK_FUNCS([vserver]) AC_CHECK_DECLS(MS_MOVE,,,[#include ]) AC_CHECK_TYPES(xid_t,,,[#include ]) +AC_CHECK_TYPES(nid_t,,,[#include ]) + +AC_CHECK_HEADERS([sys/capability.h]) dnl BIG HACK! Do some autodetection here! AC_DEFINE(UTMP_GID, [22], [The utmp gid-number]) @@ -182,20 +195,25 @@ fi 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= -FEATURES_TXT="Features: +AH_BOTTOM([#include "compat.h"]) +AC_CONFIG_COMMANDS_PRE([ + FEATURES_TXT="\ +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$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 @@ -212,9 +230,8 @@ Paths: Kernelheaders: $kernelincludedir vserver-Rootdir: $vserverdir " - -AH_BOTTOM([#include "compat.h"]) -AC_CONFIG_COMMANDS_PRE([echo "$FEATURES_TXT" >FEATURES.txt]) + echo "$FEATURES_TXT" >FEATURES.txt + ]) AC_CONFIG_FILES([util-vserver.spec Makefile distrib/Makefile lib/apidoc/Doxyfile]) AC_OUTPUT