X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=configure.ac;h=c5a5b318c74e1b0d0611e60b5557a3d46009333e;hb=HEAD;hp=ec652efeaf198e9c85e3f905a45250190389cd45;hpb=37c77164b67458367ce99f56609f608e9dec2ba1;p=util-vserver.git diff --git a/configure.ac b/configure.ac index ec652ef..c5a5b31 100644 --- a/configure.ac +++ b/configure.ac @@ -27,6 +27,7 @@ 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 @@ -81,7 +81,6 @@ if test x"$prefix" = x/; then 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]) @@ -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