From 7d5da991c5d3790da730efc51ec51d71bcd495a8 Mon Sep 17 00:00:00 2001 From: DJ Delorie Date: Tue, 7 Sep 2010 19:28:00 +0000 Subject: merge from gcc --- libdecnumber/configure | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'libdecnumber/configure') diff --git a/libdecnumber/configure b/libdecnumber/configure index 636839cf369..f94f6808190 100755 --- a/libdecnumber/configure +++ b/libdecnumber/configure @@ -4594,7 +4594,7 @@ $as_echo_n "checking for decimal floating point... " >&6; } if test "${enable_decimal_float+set}" = set; then : enableval=$enable_decimal_float; case $enable_decimal_float in - yes | no | bid | dpd) ;; + yes | no | bid | dpd) default_decimal_float=$enable_decimal_float ;; *) as_fn_error "'$enable_decimal_float' is an invalid value for --enable-decimal-float. Valid choices are 'yes', 'bid', 'dpd', and 'no'." "$LINENO" 5 ;; esac @@ -4606,8 +4606,8 @@ else enable_decimal_float=yes ;; *) - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: decimal float is not supported for this target" >&5 -$as_echo "$as_me: WARNING: decimal float is not supported for this target" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: decimal float is not supported for this target, ignored" >&5 +$as_echo "$as_me: WARNING: decimal float is not supported for this target, ignored" >&2;} enable_decimal_float=no ;; esac @@ -4626,17 +4626,21 @@ case x$enable_decimal_float in enable_decimal_float=dpd ;; esac + default_decimal_float=$enable_decimal_float ;; xno) # ENABLE_DECIMAL_FLOAT is set to 0. But we have to have proper # dependency on libdecnumber. - enable_decimal_float=dpd + default_decimal_float=dpd ;; esac +# Use default_decimal_float for dependency. +enable_decimal_float=$default_decimal_float + # If BID is being used, additional objects should be linked in. if test x$enable_decimal_float = xbid; then ADDITIONAL_OBJS="$ADDITIONAL_OBJS \$(bid_OBJS)" -- cgit v1.2.1