X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=configure.ac;h=32d1e83b8ede0814f63c04bd3e44b6f2f7dfd2e0;hb=a3093bf7ba9e93056bd6aabb30ed0d20210c345c;hp=f480a2360683d392c3fcf4dab25eb2164bac66cb;hpb=61a95befd1830137b0d817da60869f23f63d9540;p=util-vserver.git diff --git a/configure.ac b/configure.ac index f480a23..32d1e83 100644 --- a/configure.ac +++ b/configure.ac @@ -57,7 +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(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]) @@ -246,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} @@ -277,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" @@ -452,22 +449,14 @@ AM_CONDITIONAL(HAVE_SYSV_INIT, test x"$ensc_with_init" = xsysv) dnl ######################## dnl Check for Python -AM_PATH_PYTHON(,, [:]) -if test "x$PYTHON" != x:; then - ensc_have_python=yes -else +ensc_have_python=yes +AM_PATH_PYTHON([2.4],, [:]) +if test "x$PYTHON" = x:; then ensc_have_python=no fi -ensc_python_config=python-config -AC_ARG_WITH(python, AC_HELP_STRING([--with-python=FILE], [use FILE to query Python build details (default: python-config)]), [ - case "$withval" in - (no) ensc_have_python=no;; - (yes) ;; - (*) ensc_python_config="$withval";; - esac]) -if test x$ensc_have_python = xyes && $ensc_python_config --cflags > /dev/null 2>&1; then - PYTHON_CFLAGS=`$ensc_python_config --cflags` - PYTHON_LDFLAGS=`$ensc_python_config --ldflags` +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 @@ -483,6 +472,20 @@ 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]) @@ -527,6 +530,7 @@ Features: 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