Module: ppl/ppl Branch: floating_point Commit: 0bb0a14d690bda10c0893e11b6019128b3c4908e URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=0bb0a14d690bd...

Author: Roberto Bagnara bagnara@cs.unipr.it Date: Fri Sep 24 19:48:27 2010 +0200

Added missing uses of AC_LANG_SOURCE.

---

m4/ac_check_ciao.m4 | 7 ++++--- m4/ac_check_swi_prolog.m4 | 7 ++++--- m4/ac_prog_javah.m4 | 9 ++++++--- 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/m4/ac_check_ciao.m4 b/m4/ac_check_ciao.m4 index 6b8149c..04ede7d 100644 --- a/m4/ac_check_ciao.m4 +++ b/m4/ac_check_ciao.m4 @@ -55,13 +55,14 @@ _CIAO_PRINT_INCLUDE_DIR_EOF AC_LANG_PUSH(C++) AC_CHECK_HEADER(ciao_prolog.h, AC_MSG_CHECKING([for Ciao Prolog version x.y.z or later]) - AC_COMPILE_IFELSE( -[#include <ciao_prolog.h> + AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ +#include <ciao_prolog.h>

int main() { return 0; -}], +} + ]])], AC_MSG_RESULT(yes), ciao_prolog="" AC_MSG_RESULT(no) diff --git a/m4/ac_check_swi_prolog.m4 b/m4/ac_check_swi_prolog.m4 index daed0a7..bc21631 100644 --- a/m4/ac_check_swi_prolog.m4 +++ b/m4/ac_check_swi_prolog.m4 @@ -68,8 +68,8 @@ then # We require SWI-Prolog 5.6.0 or later. AC_CHECK_HEADER(SWI-Prolog.h, AC_MSG_CHECKING([for SWI-Prolog version 5.6.0 or later]) - AC_COMPILE_IFELSE( -[#include <SWI-Prolog.h> + AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ +#include <SWI-Prolog.h>

int main() { @@ -79,7 +79,8 @@ main() {

; return 0; -}], +} + ]])], AC_MSG_RESULT(yes), swi_prolog="" AC_MSG_RESULT(no) diff --git a/m4/ac_prog_javah.m4 b/m4/ac_prog_javah.m4 index 4e2a43c..e1226a0 100644 --- a/m4/ac_prog_javah.m4 +++ b/m4/ac_prog_javah.m4 @@ -26,6 +26,7 @@ AC_DEFUN([AC_PROG_JAVAH],[ AC_REQUIRE([AC_CANONICAL_HOST])dnl AC_REQUIRE([AC_PROG_CPP])dnl +AC_LANG_PUSH(C++)dnl if test "x$JAVAPREFIX" = x; then AC_CHECK_PROGS(JAVAH,javah, no) else @@ -33,7 +34,7 @@ else fi

if test x"`eval 'echo $ac_cv_path_JAVAH'`" != xno ; then - AC_PREPROC_IFELSE([#include <jni.h> ] ,,[ + AC_PREPROC_IFELSE([AC_LANG_SOURCE([[#include <jni.h>]]) ] ,,[ ac_save_CPPFLAGS="$CPPFLAGS" changequote(, )dnl ac_dir=`echo $ac_cv_path_JAVAH | sed 's,(.*)/[^/]*/[^/]*$,\1/include,'` @@ -42,9 +43,11 @@ changequote([, ])dnl JNIFLAGS="-I$ac_dir -I$ac_dir/$ac_machdep" CPPFLAGS="$ac_save_CPPFLAGS $JNIFLAGS" AC_SUBST(JNIFLAGS) - AC_PREPROC_IFELSE([#include <jni.h>], + AC_PREPROC_IFELSE([AC_LANG_SOURCE([[#include <jni.h>]])], CPPFLAGS="$ac_save_CPPFLAGS", AC_MSG_WARN([unable to include <jni.h>]) JAVAH=no) CPPFLAGS="$ac_save_CPPFLAGS"]) -fi]) +fi +AC_LANG_POP(C++) +])