summaryrefslogtreecommitdiff
path: root/m4
diff options
context:
space:
mode:
authorvlefevre <vlefevre@280ebfd0-de03-0410-8827-d642c229c3f4>2012-07-27 09:35:49 +0000
committervlefevre <vlefevre@280ebfd0-de03-0410-8827-d642c229c3f4>2012-07-27 09:35:49 +0000
commitac7e31e57897bea77d934fe777e2d1fc9900233f (patch)
tree7ad429033965cf6fe5eac6d33ddc17c4511f3b50 /m4
parent15d38f0ed9d4d325899b8f77733d7060c4f7a0e8 (diff)
downloadmpfr-ac7e31e57897bea77d934fe777e2d1fc9900233f.tar.gz
Updated autotool files to get rid of obsolete macros (thanks to
Daniel Richard G. for the patch; kept the autoconf requirement to 2.60 instead of changing it to 2.68 as done with autoupdate, since 2.60 seems to be sufficient according to the changes and 2.68 is too recent, e.g. Debian/stable still has 2.67). --- Note --- This update has another effect: The "Configs for Windows DLLs." code (from "case $host in" to "esac") is now executed at the right time, after options like --disable-static are taken into account. Juste before this change, the test if test "$enable_shared" = yes; then was always false. This could be seen on hydra: With r8360: [...] configure flags: --disable-static --disable-dependency-tracking --prefix=/nix/store/95zhbb0v23syxsazx33hg3acbvixyq5a-mpfr-0-3.2.0-dev [...] checking for DLL/static GMP... static [...] checking whether to build shared libraries... yes checking whether to build static libraries... no [...] With r8367: [...] configure flags: --disable-static --disable-dependency-tracking --prefix=/nix/store/8zblwffd2ww1z0smqlgwrfzcl6b48rim-mpfr-0-3.2.0-dev [...] checking whether to build shared libraries... yes checking whether to build static libraries... no checking for DLL/static GMP... static [...] git-svn-id: svn://scm.gforge.inria.fr/svn/mpfr/trunk@8364 280ebfd0-de03-0410-8827-d642c229c3f4
Diffstat (limited to 'm4')
-rw-r--r--m4/size_max.m47
1 files changed, 4 insertions, 3 deletions
diff --git a/m4/size_max.m4 b/m4/size_max.m4
index e44618eec..aa16e1a12 100644
--- a/m4/size_max.m4
+++ b/m4/size_max.m4
@@ -1,11 +1,12 @@
# size_max.m4 serial 6
-dnl Copyright (C) 2003, 2005-2006, 2010 Free Software Foundation, Inc.
+dnl Copyright (C) 2003, 2005-2006, 2010, 2012 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
dnl From Bruno Haible.
dnl Change by Vincent Lefevre: added <inttypes.h> for consistency with MPFR
+dnl Update with autoupdate.
AC_DEFUN([gl_SIZE_MAX],
[
@@ -39,10 +40,10 @@ Found it
if test $fits_in_uint = 1; then
dnl Even though SIZE_MAX fits in an unsigned int, it must be of type
dnl 'unsigned long' if the type 'size_t' is the same as 'unsigned long'.
- AC_TRY_COMPILE([#include <stddef.h>
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stddef.h>
extern size_t foo;
extern unsigned long foo;
- ], [], fits_in_uint=0)
+ ]], [[]])], fits_in_uint=0)
fi
dnl We cannot use 'expr' to simplify this expression, because 'expr'
dnl works only with 'long' integers in the host environment, while we