From: Enrico Scholz Date: Sun, 10 Apr 2005 00:53:44 +0000 (+0000) Subject: use a more modern version which accepts 'DIET' and 'DIETFLAGS' as X-Git-Tag: version_0_30_210~273 X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=792601b64c62323db01e10ec71b228d4a1ec6655;p=util-vserver.git use a more modern version which accepts 'DIET' and 'DIETFLAGS' as global configure variables git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@2008 94cd875c-1c1d-0410-91d2-eb244daf1a30 --- diff --git a/util-vserver/m4/ensc_dietlibc.m4 b/util-vserver/m4/ensc_dietlibc.m4 index 503320b..e829ef8 100644 --- a/util-vserver/m4/ensc_dietlibc.m4 +++ b/util-vserver/m4/ensc_dietlibc.m4 @@ -61,19 +61,25 @@ dnl * $ENSC_VERSION_DIETLIBC AC_DEFUN([ENSC_ENABLE_DIETLIBC], [ AC_MSG_CHECKING([whether to enable dietlibc]) + + AC_ARG_VAR(DIET, [The 'diet' wrapper (default: diet)]) + AC_ARG_VAR(DIETFLAGS, [Flags passed to the 'diet' wrapper (default: -O)]) + + : ${DIET:=diet} + : ${DIETFLAGS=-Os} + AC_ARG_ENABLE([dietlibc], [AC_HELP_STRING([--disable-dietlibc], [do not use dietlibc (default: use dietlibc)])], [case "$enableval" in - yes) use_dietlibc=forced;; - no) use_dietlibc=forced_no;; - *) AC_MSG_ERROR(['$enableval' is not a valid value for --enable-dietlibc]);; + (yes) use_dietlibc=forced;; + (no) use_dietlibc=forced_no;; + (*) AC_MSG_ERROR(['$enableval' is not a valid value for --enable-dietlibc]);; esac], - [: ${DIET:=diet} - which "$DIET" >/dev/null 2>/dev/null && use_dietlibc=detected || use_dietlibc=detected_no]) + [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=$($DIET -v 2>&1 | sed '1p;d') _dietlibc_ver=${_dietlibc_ver##*diet version } _dietlibc_ver=${_dietlibc_ver##*dietlibc-} _dietlibc_ver_maj=${_dietlibc_ver%%.*}