summaryrefslogtreecommitdiff
path: root/acinclude.m4
diff options
context:
space:
mode:
authorvlefevre <vlefevre@280ebfd0-de03-0410-8827-d642c229c3f4>2011-04-18 14:53:03 +0000
committervlefevre <vlefevre@280ebfd0-de03-0410-8827-d642c229c3f4>2011-04-18 14:53:03 +0000
commit7c6719ebad97e7c2c4fc383a74351b3da2bd007f (patch)
tree8dab102880eb153ca190cd1c9bfd5cfc384a344d /acinclude.m4
parent86291842dae527ea242f0feaf20235d7b4fe3acc (diff)
downloadmpfr-7c6719ebad97e7c2c4fc383a74351b3da2bd007f.tar.gz
[acinclude.m4] Correction of problems triggering the warning
"warning: AC_LANG_CONFTEST: no AC_LANG_SOURCE call detected in body" with autoconf 2.68: * Fixed missing quoting in an AC_RUN_IFELSE. * Added an AC_LANG_SOURCE in another AC_RUN_IFELSE. git-svn-id: svn://scm.gforge.inria.fr/svn/mpfr/trunk@7634 280ebfd0-de03-0410-8827-d642c229c3f4
Diffstat (limited to 'acinclude.m4')
-rw-r--r--acinclude.m415
1 files changed, 5 insertions, 10 deletions
diff --git a/acinclude.m4 b/acinclude.m4
index 3ce55adbb..11b5bd5e8 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -34,12 +34,6 @@ dnl but the IEEE-754 specific flags must be set here.
dnl -GMP's linkage.
dnl -Libtool stuff.
dnl -Handling of special arguments of MPFR's configure.
-dnl
-dnl FIXME: With autoconf 2.68, MPFR_CONFIGS generates warnings
-dnl "warning: AC_LANG_CONFTEST: no AC_LANG_SOURCE call detected in body"
-dnl This is due to: AC_RUN_IFELSE(AC_LANG_PROGRAM(...), ...)
-dnl Possibly an autoconf bug:
-dnl http://article.gmane.org/gmane.comp.sysutils.autoconf.bugs/7884
AC_DEFUN([MPFR_CONFIGS],
[
AC_REQUIRE([AC_OBJEXT])
@@ -271,7 +265,7 @@ fi
dnl Check if the chars '0' to '9' are consecutive values
AC_MSG_CHECKING([if charset has consecutive values])
-AC_RUN_IFELSE(AC_LANG_PROGRAM([[
+AC_RUN_IFELSE([AC_LANG_PROGRAM([[
char *number = "0123456789";
char *lower = "abcdefghijklmnopqrstuvwxyz";
char *upper = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
@@ -284,7 +278,7 @@ char *upper = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
if ( (*p)+1 != *(p+1) ) return 1;
for (p = (unsigned char*) upper, i = 0; i < 25; i++)
if ( (*p)+1 != *(p+1) ) return 1;
-]]), [AC_MSG_RESULT(yes)],[
+]])], [AC_MSG_RESULT(yes)],[
AC_MSG_RESULT(no)
AC_DEFINE(MPFR_NO_CONSECUTIVE_CHARSET,1,[Charset is not consecutive])
], [AC_MSG_RESULT(cannot test)])
@@ -386,14 +380,15 @@ if test "$enable_thread_safe" != no; then
AC_MSG_CHECKING(for TLS support)
saved_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS -I$srcdir/src"
-AC_RUN_IFELSE([
+AC_RUN_IFELSE([AC_LANG_SOURCE([[
#define MPFR_USE_THREAD_SAFE 1
#include "mpfr-thread.h"
MPFR_THREAD_ATTR int x = 17;
int main() {
return x != 17;
}
- ], [AC_MSG_RESULT(yes)
+ ]])],
+ [AC_MSG_RESULT(yes)
AC_DEFINE([MPFR_USE_THREAD_SAFE],1,[Build MPFR as thread safe])
],
[AC_MSG_RESULT(no)