configure.ac: Add ADDITIONAL_OBJS variable.
2007-10-31 Thiago Jung Bauermann <bauerman@br.ibm.com> * configure.ac: Add ADDITIONAL_OBJS variable. * Makefile.in (bid_OBS): New. (libdecnumber_a_OBJS): Add ADDITIONAL_OBJS, remove condition on enable_decimal_float. * configure: Regenerate. From-SVN: r129804
This commit is contained in:
parent
e2e95f45a8
commit
b1237e1315
@ -1,3 +1,11 @@
|
||||
2007-10-31 Thiago Jung Bauermann <bauerman@br.ibm.com>
|
||||
|
||||
* configure.ac: Add ADDITIONAL_OBJS variable.
|
||||
* Makefile.in (bid_OBS): New.
|
||||
(libdecnumber_a_OBJS): Add ADDITIONAL_OBJS, remove condition
|
||||
on enable_decimal_float.
|
||||
* configure: Regenerate.
|
||||
|
||||
2007-09-10 Janis Johnson <janis187@us.ibm.com>
|
||||
Ben Elliston <bje@au.ibm.com>
|
||||
|
||||
|
@ -50,19 +50,18 @@ libdir = @libdir@
|
||||
localedir = $(datadir)/locale
|
||||
prefix = @prefix@
|
||||
|
||||
ADDITIONAL_OBJS = @ADDITIONAL_OBJS@
|
||||
|
||||
enable_decimal_float= @enable_decimal_float@
|
||||
|
||||
INCLUDES = -I$(srcdir) -I.
|
||||
|
||||
ALL_CFLAGS = $(CFLAGS) $(WARN_CFLAGS) $(INCLUDES) $(CPPFLAGS)
|
||||
|
||||
libdecnumber_a_OBJS = decNumber.o decContext.o \
|
||||
decimal32.o decimal64.o decimal128.o
|
||||
bid_OBJS = bid2dpd_dpd2bid.o host-ieee32.o host-ieee64.o host-ieee128.o
|
||||
|
||||
ifeq ($(enable_decimal_float),bid)
|
||||
libdecnumber_a_OBJS+=bid2dpd_dpd2bid.o host-ieee32.o host-ieee64.o \
|
||||
host-ieee128.o
|
||||
endif
|
||||
libdecnumber_a_OBJS = decNumber.o decContext.o \
|
||||
decimal32.o decimal64.o decimal128.o $(ADDITIONAL_OBJS)
|
||||
|
||||
libdecnumber_a_SOURCES = decContext.c decContext.h decDPD.h \
|
||||
decNumber.c decNumber.h decNumberLocal.h \
|
||||
|
11
libdecnumber/configure
vendored
11
libdecnumber/configure
vendored
@ -311,7 +311,7 @@ ac_includes_default="\
|
||||
# include <unistd.h>
|
||||
#endif"
|
||||
|
||||
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS SET_MAKE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT RANLIB ac_ct_RANLIB ACLOCAL AUTOCONF AUTOHEADER WARN_CFLAGS WARN_PEDANTIC WERROR CPP EGREP MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os enable_decimal_float LIBOBJS LTLIBOBJS'
|
||||
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS SET_MAKE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT RANLIB ac_ct_RANLIB ACLOCAL AUTOCONF AUTOHEADER WARN_CFLAGS WARN_PEDANTIC WERROR CPP EGREP MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os enable_decimal_float ADDITIONAL_OBJS LIBOBJS LTLIBOBJS'
|
||||
ac_subst_files=''
|
||||
|
||||
# Initialize some variables set by options.
|
||||
@ -7478,10 +7478,18 @@ if test x$enable_decimal_float = xyes -o x$enable_decimal_float = xno; then
|
||||
esac
|
||||
fi
|
||||
|
||||
# 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)"
|
||||
else
|
||||
ADDITIONAL_OBJS=
|
||||
fi
|
||||
|
||||
echo "$as_me:$LINENO: result: $enable_decimal_float" >&5
|
||||
echo "${ECHO_T}$enable_decimal_float" >&6
|
||||
|
||||
|
||||
|
||||
echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
|
||||
echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6
|
||||
if test "${ac_cv_c_bigendian+set}" = set; then
|
||||
@ -8390,6 +8398,7 @@ s,@target_cpu@,$target_cpu,;t t
|
||||
s,@target_vendor@,$target_vendor,;t t
|
||||
s,@target_os@,$target_os,;t t
|
||||
s,@enable_decimal_float@,$enable_decimal_float,;t t
|
||||
s,@ADDITIONAL_OBJS@,$ADDITIONAL_OBJS,;t t
|
||||
s,@LIBOBJS@,$LIBOBJS,;t t
|
||||
s,@LTLIBOBJS@,$LTLIBOBJS,;t t
|
||||
CEOF
|
||||
|
@ -113,8 +113,16 @@ if test x$enable_decimal_float = xyes -o x$enable_decimal_float = xno; then
|
||||
esac
|
||||
fi
|
||||
|
||||
# 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)"
|
||||
else
|
||||
ADDITIONAL_OBJS=
|
||||
fi
|
||||
|
||||
AC_MSG_RESULT($enable_decimal_float)
|
||||
AC_SUBST(enable_decimal_float)
|
||||
AC_SUBST(ADDITIONAL_OBJS)
|
||||
|
||||
AC_C_BIGENDIAN
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user