X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Fconfigure.ac;h=094dc23f9d5eab2dde59a13b0bbf50819a9a15cf;hb=9c2cb19d6aee1ff6638c442894f22bb747477582;hp=9f675d99a996566608ae4230e4304ae8cb61aeac;hpb=7df936ad1186801847f5cadd70b65a50be4f8270;p=util-vserver.git diff --git a/util-vserver/configure.ac b/util-vserver/configure.ac index 9f675d9..094dc23 100644 --- a/util-vserver/configure.ac +++ b/util-vserver/configure.ac @@ -24,7 +24,7 @@ dnl distribution terms that you use for the rest of that program. dnl AC_PREREQ(2.57) -AC_INIT(util-vserver, 0.30.204, enrico.scholz@informatik.tu-chemnitz.de) +AC_INIT(util-vserver, 0.30.209, enrico.scholz@informatik.tu-chemnitz.de) AC_CONFIG_SRCDIR([src/capchroot.c]) AC_CONFIG_HEADER([config.h]) @@ -52,6 +52,7 @@ ENSC_PATHPROG(IP, ip,, [Usually, this tool is shipped in the 'iprout ENSC_PATHPROG(IPTABLES, iptables) ENSC_PATHPROG(MODPROBE, modprobe) ENSC_PATHPROG(NAMEIF, nameif) +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) @@ -68,17 +69,33 @@ AM_CONDITIONAL(HAVE_XSLTPROC, test "$XSLTPROC" != ':') ENSC_CHECK_CC_FLAG([-std=c99 -Wall -pedantic -W]) ENSC_CHECK_CXX_FLAG([-ansi -Wall -pedantic -W -fmessage-length=0]) -ENSC_FPIC_SYSCALL +AC_MSG_CHECKING([whether to enable extra optimizations]) +AC_ARG_ENABLE([extra-optimizations], + [AC_HELP_STRING([--disable-extra-optimizations], + [disable certain extra optimizations (default: no)])], + [case "$enableval" in + (yes) use_extra_optimizations=1;; + (no) use_extra_optimizations=;; + (*) AC_MSG_ERROR(['$enableval' is not a valid value for '--disable-extra-optimizations']);; + esac], + [use_extra_optimizations=1]) +if test x"$use_extra_optimizations" = x; then + AC_MSG_RESULT(no) +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]) AC_ARG_ENABLE([lib-debug], [AC_HELP_STRING([--enable-lib-debug], [enable additional debug code in library (default: no)])], [case "$enableval" in - yes) use_lib_debug=1;; - no) use_lib_debug=;; - *) AC_MSG_ERROR(['$enableval' is not a valid value for '--enable-lib-debug']);; + (yes) use_lib_debug=1;; + (no) use_lib_debug=;; + (*) AC_MSG_ERROR(['$enableval' is not a valid value for '--enable-lib-debug']);; esac], [ use_lib_debug= ]) @@ -92,18 +109,20 @@ fi AC_MSG_CHECKING([whether to enable expensive tests]) AC_ARG_ENABLE([expensive-tests], - [AC_HELP_STRING([--disable-expensive-tests], + [AC_HELP_STRING([--enable-expensive-tests], [disable tests which might be expensive on some systems (default: no)])], [case "$enableval" in (yes|no) use_expensive_tests=$enableval;; - (*) AC_MSG_ERROR(['$enableval' is not a valid value for '--disable-expensive-tests']);; + (*) AC_MSG_ERROR(['$enableval' is not a valid value for '--enable-expensive-tests']);; esac], - [ use_expensive_tests=yes ]) + [ use_expensive_tests=no ]) AC_MSG_RESULT($use_expensive_tests) AC_SUBST(ENSC_USE_EXPENSIVE_TESTS, "$use_expensive_tests") +ENSC_CHECK_PERSONALITY_FLAGS + AC_ARG_VAR(CC, [The C compiler]) ENSC_INITRDDIR(initrddir) @@ -113,7 +132,14 @@ dnl ########################### dnl dnl {some dietlibc related tests dnl -ENSC_ENABLE_DIETLIBC(USE_DIETLIBC, [0.25]) + +case $host_cpu in + (i*86|athlon) min_diet_ver=0.25;; + (ia64|hppa*) min_diet_ver=0.29;; + (*) min_diet_ver=0.28;; +esac + +ENSC_ENABLE_DIETLIBC(USE_DIETLIBC, [$min_diet_ver]) if test x"$ensc_have_dietlibc" = xno; then AC_MSG_WARN([*** ***]) @@ -136,6 +162,9 @@ else ENSC_DIETLIBC_NEED_COMPAT(USE_DIETLIBC_COMPAT) fi +AM_CONDITIONAL(ENSC_USE_DIETLIBC, test x"$ensc_have_dietlibc" = xyes) +AM_CONDITIONAL(ENSC_USE_GLIBC, true) + # HACK: see comments at 'enable_static' above AC_PROG_LIBTOOL dnl @@ -144,7 +173,6 @@ dnl dnl ########################## -ENSC_KERNEL_HEADERS(kernelincludedir) ENSC_UV_VROOTDIR(vserverdir) ENSC_CHANGELOG([trunk]) @@ -222,7 +250,7 @@ dnl dnl ########################## -ENSC_SYSCALLNR(vserver,273) +ENSC_SYSCALLNR(vserver,273,[lib/syscall-fallback.h]) ENSC_SYSCALL ENSC_CHECK_EXT2FS_HEADER AC_CHECK_FUNCS([vserver]) @@ -318,7 +346,6 @@ Paths: cfg-Directory: $sysconfdir/vservers initrd-Directory: $initrddir pkgstate-Directory: $localstatedir/run/vservers - Kernelheaders: $kernelincludedir vserver-Rootdir: $vserverdir " echo "$FEATURES_TXT" >FEATURES.txt