X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=configure.ac;h=c5a5b318c74e1b0d0611e60b5557a3d46009333e;hb=HEAD;hp=e0824e05ead888e9bfef0b00eeabd0ec822a14bd;hpb=ab4b2dd361f2086da8ec0ae99ef4bf79dd7265d9;p=util-vserver.git diff --git a/configure.ac b/configure.ac index e0824e0..c5a5b31 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 @@ -37,14 +38,13 @@ AC_CANONICAL_HOST AC_SUBST(GPG_KEY, "0xFFD316AC53ACA43A!") # Checks for programs. -AC_PROG_CXX AC_PROG_CC AC_PROG_INSTALL AC_PROG_LN_S 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 @@ -78,10 +78,9 @@ 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]) AC_MSG_CHECKING([whether to enable extra optimizations]) AC_ARG_ENABLE([extra-optimizations], @@ -99,7 +98,6 @@ if test x"$use_extra_optimizations" = x; then else AC_MSG_RESULT(yes) ENSC_CHECK_CC_FLAG([-funit-at-a-time]) - ENSC_CHECK_CXX_FLAG([-funit-at-a-time]) fi AC_MSG_CHECKING([whether to enable debug-code in library]) @@ -206,8 +204,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]) @@ -258,14 +256,14 @@ echo $enable_apis | sed 's/,/\n/g' | while read i; 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);; @@ -340,7 +338,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 ]) @@ -456,8 +454,8 @@ if test "x$PYTHON" = x:; then ensc_have_python=no fi if test x$ensc_have_python = xyes; then - PYTHON_CFLAGS=-I`$PYTHON -c 'from distutils.sysconfig import get_python_inc; print get_python_inc(1)'` - PYTHON_LDFLAGS=-L`$PYTHON -c 'from distutils.sysconfig import get_python_lib; print get_python_lib(1)'` + PYTHON_CFLAGS=-I`$PYTHON -c 'from distutils.sysconfig import get_python_inc; print(get_python_inc(1))'` + PYTHON_LDFLAGS=-L`$PYTHON -c 'from distutils.sysconfig import get_python_lib; print(get_python_lib(1))'` AC_SUBST(PYTHON_CFLAGS) AC_SUBST(PYTHON_LDFLAGS) else @@ -517,10 +515,8 @@ 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_version_msg$ensc_diet_msg$ensc_diet_compat_msg Build C++ programs: $ensc_cv_cxx_cxxcompiler$ensc_cxx_affected @@ -532,7 +528,7 @@ Features: crypto api: $ensc_crypto_api python bindings: $ensc_have_python use library versioning: $ensc_have_versioning - + Paths: prefix: $prefix sysconf-Directory: $sysconfdir