X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=configure.ac;h=32d1e83b8ede0814f63c04bd3e44b6f2f7dfd2e0;hb=a3093bf7ba9e93056bd6aabb30ed0d20210c345c;hp=b1870165096451f355a3dc05f934e55f35eee4c5;hpb=ea962a4b84ce0d06957f522f568b547872c3b579;p=util-vserver.git diff --git a/configure.ac b/configure.ac index b187016..32d1e83 100644 --- a/configure.ac +++ b/configure.ac @@ -57,6 +57,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(FILE, file, [file]) ENSC_PATHPROG(GZIP, gzip, [gzip]) ENSC_PATHPROG(BZIP2, bzip2, [bzip2]) @@ -245,10 +246,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} @@ -276,7 +275,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" @@ -314,15 +312,15 @@ dnl ######################## dnl dnl {crypto stuff dnl -AC_MSG_CHECKING([for used crypto API]) AC_ARG_WITH(crypto-api, AC_HELP_STRING([--with-crypto-api=API], [select crypto api to be used; possible values are `none', `nss', `beecrypt', `auto' (default:auto)]), [case $withval in (none|nss|beecrypt|auto) ensc_crypto_api=$withval;; + (yes) ensc_crypto_api=auto;; + (no) ensc_crypto_api=none;; (*) AC_MSG_ERROR([invalid crypto-api value, only none,nss,beecrypt,auto are supported]);; esac],[ensc_crypto_api=auto]) -AC_MSG_RESULT($ensc_crypto_api) dnl Now, check for matching crypto api. When selected 'auto', the @@ -378,8 +376,7 @@ case $ensc_crypto_api in (nss) PKG_CHECK_MODULES(NSS, nss);; (auto) PKG_CHECK_MODULES(NSS, nss, [ AC_MSG_NOTICE([using NSS as crypto api]) - ensc_crypto_api=nss], - AC_MSG_RESULT(no));; + ensc_crypto_api=nss]);; esac dnl @@ -404,14 +401,14 @@ case $ensc_crypto_api in ENSC_CAN_CRYPTO_WITH_DIETLIBC=false ;; -(none) +(none|auto) ENSC_HAVE_CRYPTO=false ENSC_CRYPTO_API=ENSC_CRYPTO_API_NONE ENSC_CRYPTO_CFLAGS= ENSC_CRYPTO_LIB= ENSC_CAN_CRYPTO_WITH_DIETLIBC=false - AC_MSG_WARN([No crypto api found/select. This will disable the build of `vhashify']) + AC_MSG_WARN([No crypto api found/select. This will disable the build of 'vhashify']) ;; (*) AC_MSG_ERROR([internal error]) @@ -449,6 +446,46 @@ AM_CONDITIONAL(HAVE_GENTOO_INIT, test x"$ensc_with_init" = xgentoo) AM_CONDITIONAL(HAVE_SYSV_INIT, test x"$ensc_with_init" = xsysv) +dnl ######################## +dnl Check for Python + +ensc_have_python=yes +AM_PATH_PYTHON([2.4],, [:]) +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)'` + AC_SUBST(PYTHON_CFLAGS) + AC_SUBST(PYTHON_LDFLAGS) +else + ensc_have_python=no +fi +AC_PATH_PROG([CTAGS], [ctags], [no]) +if test "x$CTAGS" = xno; then + ensc_have_python=no +fi +AM_CONDITIONAL([HAVE_PYTHON], [test x$ensc_have_python = xyes]) + +dnl Python stuff ends here +dnl ######################## + + +dnl ######################## +dnl Library versioning + +ensc_have_versioning=yes +AC_ARG_ENABLE(versioning, AC_HELP_STRING([--disable-versioning], [Disable library versioning]), [ensc_have_versioning="$enableval"]) +AM_CONDITIONAL([HAVE_VERSIONING], [test "x$ensc_have_versioning" = xyes]) +if test "x$ensc_have_versioning" = xyes; then + AC_DEFINE([HAVE_VERSIONING], [1], [Define this to use library versioning]) +fi + +dnl /Library versioning +dnl ######################## + + dnl BIG HACK! Do some autodetection here! AC_DEFINE(UTMP_GID, [22], [The utmp gid-number]) @@ -492,6 +529,8 @@ Features: syscall(2) invocation: $with_syscall vserver(2) syscall#: $ensc_cv_value_syscall_vserver crypto api: $ensc_crypto_api + python bindings: $ensc_have_python + use library versioning: $ensc_have_versioning Paths: prefix: $prefix