diff options
| author | enge <enge@211d60ee-9f03-0410-a15a-8952a2c7a4e4> | 2011-07-21 16:51:03 +0000 |
|---|---|---|
| committer | enge <enge@211d60ee-9f03-0410-a15a-8952a2c7a4e4> | 2011-07-21 16:51:03 +0000 |
| commit | bf328ef176489ce913a7206ff64b18046d5230da (patch) | |
| tree | 045c59892956a2d8be0cafdbe909704983a25062 | |
| parent | db5f5b06ff7776c8e9d7089c82487894f4ef3c2b (diff) | |
| download | mpc-bf328ef176489ce913a7206ff64b18046d5230da.tar.gz | |
configure.ac, mpc.m4: under windows, check first for mpfr, then for dlls
git-svn-id: svn://scm.gforge.inria.fr/svn/mpc/trunk@1016 211d60ee-9f03-0410-a15a-8952a2c7a4e4
| -rw-r--r-- | configure.ac | 15 | ||||
| -rw-r--r-- | doc/version.texi | 4 | ||||
| -rw-r--r-- | m4/mpc.m4 | 5 |
3 files changed, 13 insertions, 11 deletions
diff --git a/configure.ac b/configure.ac index 893f176..a5cb05c 100644 --- a/configure.ac +++ b/configure.ac @@ -112,13 +112,6 @@ if test -z "$user_redefine_cc" ; then fi -# Configs for Windows DLLs -case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*) - MPC_WINDOWS -esac - - # Checks for header files. AC_HEADER_STDC AC_CHECK_HEADERS([locale.h inttypes.h stdint.h limits.h unistd.h sys/time.h]) @@ -197,6 +190,14 @@ AS_IF([test "x$enable_logging" = "xyes"], ] ) + +# Configs for Windows DLLs +case $host in + *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*) + MPC_WINDOWS +esac + + # Checks if compiler accepts warning flags. MPC_PROG_CC_WARNINGCFLAGS([WARNINGCFLAGS]) diff --git a/doc/version.texi b/doc/version.texi index cf21733..a4aa791 100644 --- a/doc/version.texi +++ b/doc/version.texi @@ -1,4 +1,4 @@ -@set UPDATED 21 February 2011 -@set UPDATED-MONTH February 2011 +@set UPDATED 20 June 2011 +@set UPDATED-MONTH June 2011 @set EDITION 0.9.1-dev @set VERSION 0.9.1-dev @@ -192,9 +192,9 @@ MPC_WINDOWS # It also disables the tests involving the linking with LIBGMP if DLL # AC_DEFUN([MPC_WINDOWS], [ - AC_MSG_CHECKING(for DLL/static GMP) if test "$enable_shared" = yes; then LDFLAGS="$LDFLAGS -Wl,-no-undefined" + AC_MSG_CHECKING(for DLL/static gmp) AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include "gmp.h" #if !__GMP_LIBGMP_DLL @@ -204,6 +204,7 @@ error ]], [[]])],[AC_MSG_RESULT(DLL)],[ AC_MSG_RESULT(static) AC_MSG_ERROR([gmp is not available as a DLL: use --enable-static --disable-shared]) ]) + AC_MSG_CHECKING(for DLL/static mpfr) AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include "mpfr.h" #if !__GMP_LIBGMP_DLL @@ -212,7 +213,7 @@ error #endif ]], [[]])],[AC_MSG_RESULT(DLL)],[ AC_MSG_RESULT(static) - AC_MSG_ERROR([gmp is not available as a DLL: use --enable-static --disable-shared]) ]) + AC_MSG_ERROR([mpfr is not available as a DLL: use --enable-static --disable-shared]) ]) else AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include "gmp.h" |