From 6ac0e29e1e52943f06c1a9a0363cfa425f530879 Mon Sep 17 00:00:00 2001 From: Enrico Scholz Date: Fri, 19 Mar 2004 16:51:22 +0000 Subject: [PATCH] allow to specify a git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@1310 94cd875c-1c1d-0410-91d2-eb244daf1a30 --- util-vserver/m4/ensc_dietlibc.m4 | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/util-vserver/m4/ensc_dietlibc.m4 b/util-vserver/m4/ensc_dietlibc.m4 index b13aea1..bb7f3fa 100644 --- a/util-vserver/m4/ensc_dietlibc.m4 +++ b/util-vserver/m4/ensc_dietlibc.m4 @@ -51,7 +51,7 @@ AC_DEFUN([_ENSC_DIETLIBC_C99], fi ]) -dnl Usage: ENSC_ENABLE_DIETLIBC() +dnl Usage: ENSC_ENABLE_DIETLIBC([,]) dnl ... automake-conditional which will be set when dnl dietlibc shall be enabled @@ -69,6 +69,21 @@ AC_DEFUN([ENSC_ENABLE_DIETLIBC], [: ${DIET:=diet} which "$DIET" >/dev/null 2>/dev/null && use_dietlibc=detected || use_dietlibc=detected_no]) + if test "$use_dietlibc" = detected -a '$2'; then + _dietlibc_ver=$(${DIET:-diet} -v 2>&1 | sed '1p;d') + _dietlibc_ver=${_dietlibc_ver##*dietlibc-} + _dietlibc_ver_maj=${_dietlibc_ver%%.*} + _dietlibc_ver_min=${_dietlibc_ver##*.} + _dietlibc_cmp=$2 + _dietlibc_cmp_maj=${_dietlibc_cmp%%.*} + _dietlibc_cmp_min=${_dietlibc_cmp%%.*} + + let _dietlibc_ver=_dietlibc_ver_maj*1000+_dietlibc_ver_min 2>/dev/null || _dietlibc_ver=0 + let _dietlibc_cmp=_dietlibc_cmp_maj*1000+_dietlibc_cmp_min + + test $_dietlibc_ver -ge $_dietlibc_cmp || use_dietlibc=detected_old + fi + ensc_have_dietlibc=no case x"$use_dietlibc" in xdetected) @@ -85,6 +100,10 @@ AC_DEFUN([ENSC_ENABLE_DIETLIBC], AM_CONDITIONAL($1, false) AC_MSG_RESULT([no (detected)]) ;; + xdetected_old) + AM_CONDITIONAL($1, false) + AC_MSG_RESULT([no (too old; $2 required)]) + ;; xforced_no) AM_CONDITIONAL($1, false) AC_MSG_RESULT([no (forced)]) -- 1.8.1.5