X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=configure.ac;h=77eb904a9c798ee0f624277998942341d7f5425b;hb=4d83b16873c3833729374cf45163f0d5bc00aa76;hp=360df945d0947bb1fef72fe32b78a79de9ae40a9;hpb=e1e2fc816a156709191af5d4a3a141128d02a92b;p=util-vserver.git diff --git a/configure.ac b/configure.ac index 360df94..77eb904 100644 --- a/configure.ac +++ b/configure.ac @@ -1,32 +1,33 @@ dnl $Id$ dnl Copyright (C) 2003,2004 Enrico Scholz -dnl +dnl dnl This program is free software; you can redistribute it and/or modify dnl it under the terms of the GNU General Public License as published by dnl the Free Software Foundation; either version 2, or (at your option) dnl any later version. -dnl +dnl dnl This program is distributed in the hope that it will be useful, dnl but WITHOUT ANY WARRANTY; without even the implied warranty of dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the dnl GNU General Public License for more details. -dnl +dnl dnl You should have received a copy of the GNU General Public License dnl along with this program; if not, write to the Free Software dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -dnl -dnl +dnl +dnl dnl As a special exception to the GNU General Public License, if you dnl distribute this file as part of a program that contains a configuration dnl script generated by Autoconf, you may include it under the same dnl distribution terms that you use for the rest of that program. -dnl +dnl AC_PREREQ(2.57) AC_INIT(util-vserver, 0.30.215, vserver@list.linux-vserver.org) AC_CONFIG_SRCDIR([src/capchroot.c]) AC_CONFIG_HEADER([config.h]) +AC_CONFIG_MACRO_DIR([m4]) AM_INIT_AUTOMAKE([1.9 gnits dist-bzip2 subdir-objects]) AM_MAINTAINER_MODE @@ -45,6 +46,7 @@ AM_PROG_CC_C_O PKG_PROG_PKG_CONFIG ENSC_CXXCOMPILER ENSC_C99COMPILER +AM_PROG_MKDIR_P ENSC_SET_SEARCHPATH([$PATH:/sbin:/usr/sbin:/usr/local/sbin]) ENSC_PATHPROG_STANDARD_TOOLS @@ -57,7 +59,7 @@ ENSC_PATHPROG(NOHUP, nohup) 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(IONICE, ionice,, [This is usually shipped in the 'util-linux(-ng)' or 'schedutils' package]) +ENSC_PATHPROG(IONICE, ionice, [], [This is usually shipped in the 'util-linux(-ng)' or 'schedutils' package]) ENSC_PATHPROG(FILE, file, [file]) ENSC_PATHPROG(GZIP, gzip, [gzip]) ENSC_PATHPROG(BZIP2, bzip2, [bzip2]) @@ -66,6 +68,7 @@ ENSC_PATHPROG(RESTORE, restore, [restore]) ENSC_PATHPROG(RSYNC, rsync, [rsync]) ENSC_PATHPROG(STRACE, strace, [strace]) ENSC_PATHPROG(FSCK, fsck) +ENSC_PATHPROG(FIND, find) ENSC_PATHPROG(DOXYGEN, doxygen, [:]) ENSC_PATHPROG(XSLTP, xsltp, [:]) @@ -77,7 +80,7 @@ AM_CONDITIONAL(HAVE_XSLTPROC, test "$XSLTPROC" != ':') if test x"$prefix" = x/; then prefix= -fi +fi ENSC_CHECK_CC_FLAG([-std=c99 -Wall -pedantic -W]) ENSC_CHECK_CXX_FLAG([-ansi -Wall -pedantic -W -fmessage-length=0]) @@ -205,8 +208,8 @@ 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']);; + (yes|no) ;; + (*) AC_MSG_ERROR(['$i' is not a supported value for '--disable-internal-headers']);; esac], [enable_internal_headers=yes]) @@ -246,10 +249,8 @@ test x"$enable_apis" != xALL || enable_apis='legacy,compat,v11,fscompat,v13 test x"$enable_apis" != xNOLEGACY || enable_apis='compat,v11,fscompat,v13,net,v21,v22,v23,netv2' enable_api_oldproc= enable_api_olduts= -old_IFS=$IFS -IFS=,; -for i in $enable_apis; do +echo $enable_apis | sed 's/,/\n/g' | while read i; do case "$i" in (compat) AC_DEFINE(VC_ENABLE_API_COMPAT, 1) enable_api_oldproc=${enable_api_oldproc:-1} @@ -259,14 +260,14 @@ for i in $enable_apis; do enable_api_oldproc=${enable_api_oldproc:-1} enable_api_olduts=${enable_api_olduts:-1} ;; - (v11) AC_DEFINE(VC_ENABLE_API_V11, 1) + (v11) AC_DEFINE(VC_ENABLE_API_V11, 1) enable_api_oldproc=${enable_api_oldproc:-1} enable_api_olduts=${enable_api_olduts:-1} ;; (fscompat) AC_DEFINE(VC_ENABLE_API_FSCOMPAT, 1);; (v13obs) AC_DEFINE(VC_ENABLE_API_V13OBS, 1) AC_DEFINE(VC_ENABLE_API_V13, 1);; - (v13) AC_DEFINE(VC_ENABLE_API_V13, 1);; + (v13) AC_DEFINE(VC_ENABLE_API_V13, 1);; (net) AC_DEFINE(VC_ENABLE_API_NET, 1);; (v21) AC_DEFINE(VC_ENABLE_API_V21, 1);; (v22) AC_DEFINE(VC_ENABLE_API_V22, 1);; @@ -277,7 +278,6 @@ for i in $enable_apis; do (*) AC_MSG_ERROR(['$i' is not a supported API]);; esac done -IFS=$old_IFS if test x"$enable_api_oldproc" != x; then AC_DEFINE(VC_ENABLE_API_OLDPROC, 1) test x"$enable_api_oldproc" != x2 && enable_apis="$enable_apis,oldproc" @@ -342,7 +342,7 @@ if test x"$ensc_cv_c99_c99compiler" = xyes; then AC_CHECK_HEADER([beecrypt/beecrypt.h], [ : ], [ ensc_have_beecrypt=no ]) fi - + if test x"$ensc_have_beecrypt" = xyes; then AC_CHECK_LIB(beecrypt, hashFunctionContextInit, [ : ], [ ensc_have_beecrypt=no ]) @@ -534,7 +534,7 @@ Features: crypto api: $ensc_crypto_api python bindings: $ensc_have_python use library versioning: $ensc_have_versioning - + Paths: prefix: $prefix sysconf-Directory: $sysconfdir