diff options
| author | Kevin Ryde <user42@zip.com.au> | 2002-04-13 03:53:55 +0200 |
|---|---|---|
| committer | Kevin Ryde <user42@zip.com.au> | 2002-04-13 03:53:55 +0200 |
| commit | 6df117b05dbadebc8614ce2e66a8d7ae6da8f367 (patch) | |
| tree | f16d4d0f3da0e6b36b1cf275621c90a8f4c9161f | |
| parent | e74f03ce61ed073b1933a968e636c5a9fe44281c (diff) | |
| download | gmp-6df117b05dbadebc8614ce2e66a8d7ae6da8f367.tar.gz | |
* mpfr/*: Update to another new mpfr 2.0.1.
* configure.in, Makefile.am, mpfr/Makefile.am, mpfr/tests/Makefile.am:
Use MPFR_CONFIGS macro, establish separate MPFR_CFLAGS for mpfr build.
| -rw-r--r-- | configure.in | 16 | ||||
| -rw-r--r-- | mpfr/Makefile.am | 2 | ||||
| -rw-r--r-- | mpfr/tests/Makefile.am | 2 |
3 files changed, 9 insertions, 11 deletions
diff --git a/configure.in b/configure.in index 31f899348..3495c9d71 100644 --- a/configure.in +++ b/configure.in @@ -1933,26 +1933,24 @@ AC_SUBST(gmp_srclinks) # Configs for mpfr. # if test $enable_mpfr = yes; then + gmp_save_CFLAGS=$CFLAGS + MPFR_CONFIGS + AC_SUBST(MPFR_CFLAGS,$CFLAGS) + CFLAGS=$gmp_save_CFLAGS + # Denorm support is necessary for mpfr_set_d and mpfr_get_d, and for the # various test programs. On alpha denorms cause SIGFPE by default. # -mieee-with-inexact is for gcc, -ieee_with_inexact is for DEC C. # - CFLAGS_IEEE_WITH_INEXACT= case $host in alpha*-*-*) for i in -mieee-with-inexact -ieee_with_inexact; do - GMP_PROG_CC_WORKS($CC $CFLAGS $i, - [CFLAGS_IEEE_WITH_INEXACT=$i + GMP_PROG_CC_WORKS($CC $MPFR_CFLAGS $i, + [MPFR_CFLAGS="$MPFR_CFLAGS $i" break]) done ;; esac - AC_SUBST(CFLAGS_IEEE_WITH_INEXACT) - - gmp_save_CFLAGS=$CFLAGS - MPFR_CONFIGS - AC_SUBST(MPFR_CFLAGS,$CFLAGS) - CFLAGS=$gmp_save_CFLAGS fi diff --git a/mpfr/Makefile.am b/mpfr/Makefile.am index d2bc81ef3..edd4d4f38 100644 --- a/mpfr/Makefile.am +++ b/mpfr/Makefile.am @@ -28,7 +28,7 @@ AUTOMAKE_OPTIONS = gnu no-dependencies $(top_builddir)/ansi2knr SUBDIRS = tests INCLUDES = -I$(top_srcdir) -CFLAGS = @CFLAGS@ $(CFLAGS_IEEE_WITH_INEXACT) +CFLAGS = @MPFR_CFLAGS@ if WANT_MPFR lib_LIBRARIES = libmpfr.a diff --git a/mpfr/tests/Makefile.am b/mpfr/tests/Makefile.am index 1c74aa29c..4ae3f8ebe 100644 --- a/mpfr/tests/Makefile.am +++ b/mpfr/tests/Makefile.am @@ -22,7 +22,7 @@ AUTOMAKE_OPTIONS = gnu no-dependencies $(top_builddir)/ansi2knr INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/mpfr -CFLAGS = @CFLAGS@ $(CFLAGS_IEEE_WITH_INEXACT) +CFLAGS = @MPFR_CFLAGS@ LDADD = ../libmpfr.a $(top_builddir)/libgmp.la $(LIBM) if WANT_MPFR |