From c737fedddcbe4d146d6040777b5fd89e6a51f08b Mon Sep 17 00:00:00 2001 From: Enrico Scholz Date: Fri, 1 Oct 2004 11:50:22 +0000 Subject: [PATCH] give out information about version of the found dietlibc git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@1719 94cd875c-1c1d-0410-91d2-eb244daf1a30 --- util-vserver/configure.ac | 4 +++- util-vserver/m4/ensc_dietlibc.m4 | 8 ++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/util-vserver/configure.ac b/util-vserver/configure.ac index a5a0499..a4ba155 100644 --- a/util-vserver/configure.ac +++ b/util-vserver/configure.ac @@ -195,10 +195,12 @@ fi ensc_cxx_affected=" (affected: vbuild, vcheck)" ensc_c99_affected=" (affected: vunify, vcopy)" ensc_diet_msg=" (you have been warned)" +ensc_diet_version_msg=" ($ensc_version_dietlibc)" ensc_diet_compat_msg=" (using -lcompat)" test x"$ensc_cv_cxx_cxxcompiler" = xno || ensc_cxx_affected= test x"$ensc_cv_c99_c99compiler" = xno || ensc_c99_affected= test x"$ensc_have_dietlibc" = xno || ensc_diet_msg= +test x"$ensc_version_dietlibc" != x || ensc_diet_version_msg= test x"$ensc_have_dietlibc$ensc_cv_c_dietlibc_compat" = xyesyes || ensc_diet_compat_msg= AH_BOTTOM([#include "compat.h"]) @@ -211,7 +213,7 @@ Features: CFLAGS: '$CFLAGS' CXXFLAGS: '$CXXFLAGS' build/host: $build/$host - Use dietlibc: $ensc_have_dietlibc$ensc_diet_msg$ensc_diet_compat_msg + 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 Build C99 programs: $ensc_cv_c99_c99compiler$ensc_c99_affected Available APIs: $enable_apis diff --git a/util-vserver/m4/ensc_dietlibc.m4 b/util-vserver/m4/ensc_dietlibc.m4 index 38ef183..d60ec23 100644 --- a/util-vserver/m4/ensc_dietlibc.m4 +++ b/util-vserver/m4/ensc_dietlibc.m4 @@ -79,17 +79,21 @@ AC_DEFUN([ENSC_ENABLE_DIETLIBC], _dietlibc_cmp_maj=${_dietlibc_cmp%%.*} _dietlibc_cmp_min=${_dietlibc_cmp##*.} + ensc_version_dietlibc=$_dietlibc_ver_maj.$_dietlibc_ver_min + 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 + else + ensc_version_dietlibc= fi ensc_have_dietlibc=no case x"$use_dietlibc" in xdetected) AM_CONDITIONAL($1, true) - AC_MSG_RESULT([yes (autodetected)]) + AC_MSG_RESULT([yes (autodetected, $ensc_version_dietlibc)]) ensc_have_dietlibc=yes ;; xforced) @@ -103,7 +107,7 @@ AC_DEFUN([ENSC_ENABLE_DIETLIBC], ;; xdetected_old) AM_CONDITIONAL($1, false) - AC_MSG_RESULT([no (too old; $2+ required)]) + AC_MSG_RESULT([no (too old; $2+ required, $ensc_version_dietlibc found)]) ;; xforced_no) AM_CONDITIONAL($1, false) -- 1.8.1.5