diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2019-04-04 18:26:14 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2019-04-04 18:26:14 (GMT) |
| commit | ca1165f3ab5121e433eb8ffa4de74e061c8b3cd1 (patch) | |
| tree | 24b60c102d5ad82392ba42f6cfb5b012dd39d971 /m4/ax_prog_javah.m4 | |
| parent | 7dfec79e315df8c9001ec10f8d4ff7bba39ff924 (diff) | |
| download | hdf5-ca1165f3ab5121e433eb8ffa4de74e061c8b3cd1.zip hdf5-ca1165f3ab5121e433eb8ffa4de74e061c8b3cd1.tar.gz hdf5-ca1165f3ab5121e433eb8ffa4de74e061c8b3cd1.tar.bz2 | |
Update java m4 scripts
Diffstat (limited to 'm4/ax_prog_javah.m4')
| -rw-r--r-- | m4/ax_prog_javah.m4 | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/m4/ax_prog_javah.m4 b/m4/ax_prog_javah.m4 index cefc616..935ec89 100644 --- a/m4/ax_prog_javah.m4 +++ b/m4/ax_prog_javah.m4 @@ -1,5 +1,5 @@ # =========================================================================== -# http://www.gnu.org/software/autoconf-archive/ax_prog_javah.html +# https://www.gnu.org/software/autoconf-archive/ax_prog_javah.html # =========================================================================== # # SYNOPSIS @@ -21,7 +21,7 @@ # and this notice are preserved. This file is offered as-is, without any # warranty. -#serial 8 +#serial 11 AU_ALIAS([AC_PROG_JAVAH], [AX_PROG_JAVAH]) AC_DEFUN([AX_PROG_JAVAH],[ @@ -30,19 +30,19 @@ AC_REQUIRE([AC_PROG_CPP])dnl AC_PATH_PROG(JAVAH,javah) AS_IF([test -n "$ac_cv_path_JAVAH"], [ - AC_TRY_CPP([#include <jni.h>],,[ + AC_PREPROC_IFELSE([AC_LANG_SOURCE([[#include <jni.h>]])],[],[ ac_save_CPPFLAGS="$CPPFLAGS" - _ACJAVAH_FOLLOW_SYMLINKS("$ac_cv_path_JAVAH") + _ACJAVAH_FOLLOW_SYMLINKS("$ac_cv_path_JAVAH") ax_prog_javah_bin_dir=`AS_DIRNAME([$_ACJAVAH_FOLLOWED])` ac_dir="`AS_DIRNAME([$ax_prog_javah_bin_dir])`/include" AS_CASE([$build_os], - [cygwin*], + [cygwin*|mingw*], [ac_machdep=win32], [ac_machdep=`AS_ECHO($build_os) | sed 's,[[-0-9]].*,,'`]) CPPFLAGS="$ac_save_CPPFLAGS -I$ac_dir -I$ac_dir/$ac_machdep" - AC_TRY_CPP([#include <jni.h>], - ac_save_CPPFLAGS="$CPPFLAGS", - AC_MSG_WARN([unable to include <jni.h>])) + AC_PREPROC_IFELSE([AC_LANG_SOURCE([[#include <jni.h>]])], + [ac_save_CPPFLAGS="$CPPFLAGS"], + [AC_MSG_WARN([unable to include <jni.h>])]) CPPFLAGS="$ac_save_CPPFLAGS"]) ]) ]) |