X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Fconfigure.ac;h=438aaf0ff8e59430ae1c4ca61566ea54afc32a92;hb=c7f183c339f7c07561928e00b18bfa44a0d5cc1c;hp=a5a04998179029feff36599ff403091858b078fe;hpb=65bc10c7c010c2fb9ea8c778f9c5ae944e7663cc;p=util-vserver.git diff --git a/util-vserver/configure.ac b/util-vserver/configure.ac index a5a0499..438aaf0 100644 --- a/util-vserver/configure.ac +++ b/util-vserver/configure.ac @@ -24,14 +24,17 @@ dnl distribution terms that you use for the rest of that program. dnl AC_PREREQ(2.57) -AC_INIT(util-vserver, 0.30.194, enrico.scholz@informatik.tu-chemnitz.de) +AC_INIT(util-vserver, 0.30.204, enrico.scholz@informatik.tu-chemnitz.de) AC_CONFIG_SRCDIR([src/capchroot.c]) AC_CONFIG_HEADER([config.h]) AM_INIT_AUTOMAKE([1.9 gnits dist-bzip2 subdir-objects]) AM_MAINTAINER_MODE -AC_SUBST(GPG_KEY, "0x7AE5D4B5922F7AF9!") +AC_CANONICAL_BUILD +AC_CANONICAL_HOST + +AC_SUBST(GPG_KEY, "0xFFD316AC53ACA43A!") # Checks for programs. AC_PROG_CXX @@ -44,29 +47,23 @@ 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(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(ENV, [env], [/usr/bin/env]) -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,, [Usually, this tool is shipped in the 'iproute' or 'iproute2' package of your distribution]) +ENSC_PATHPROG(IPTABLES, iptables) +ENSC_PATHPROG(MODPROBE, modprobe) +ENSC_PATHPROG(NAMEIF, nameif) +ENSC_PATHPROG(RMMOD, rmmod) +ENSC_PATHPROG(VCONFIG, vconfig,, [See http://www.candelatech.com/~greear/vlan.html; usually this tool is shipped in the 'vconfig' or 'vlan' package of your distribution]) +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]) @@ -109,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 @@ -184,6 +182,8 @@ 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]) @@ -195,10 +195,12 @@ 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= AH_BOTTOM([#include "compat.h"]) @@ -211,7 +213,7 @@ Features: 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