diff options
| author | Benjamin Dauvergne <bdauvergne@entrouvert.com> | 2009-08-26 15:14:56 +0000 |
|---|---|---|
| committer | Benjamin Dauvergne <bdauvergne@entrouvert.com> | 2009-08-26 15:14:56 +0000 |
| commit | 6e33ada682bd0aa9f746e1407afbda93af9b2d25 (patch) | |
| tree | 567f5be90e5223a179f0efdb9043bf2daabca5b5 /m4/ac_prog_javah.m4 | |
| parent | 366e4433610e8846b9ceb82952eb2f42fd7284f6 (diff) | |
| download | lasso-6e33ada682bd0aa9f746e1407afbda93af9b2d25.tar.gz lasso-6e33ada682bd0aa9f746e1407afbda93af9b2d25.tar.xz lasso-6e33ada682bd0aa9f746e1407afbda93af9b2d25.zip | |
Core: Use automake-1.11 when possible
* Makefile.am:
use new automake-1.11 silent rules if possible
move macros to m4 directory
* m4/gtk-doc.m4:
add gtk-doc macros.
* lasso/Makefile.am:
add missing -f flag to rm, to unbreak make distcheck
* docs/references/Makefile.am:
fix problem between libtool and gtk-doc
* autogen.sh:
update to autogen.sh from gtk-doc, add support for automake-1.11
Diffstat (limited to 'm4/ac_prog_javah.m4')
| -rw-r--r-- | m4/ac_prog_javah.m4 | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/m4/ac_prog_javah.m4 b/m4/ac_prog_javah.m4 new file mode 100644 index 00000000..6da77847 --- /dev/null +++ b/m4/ac_prog_javah.m4 @@ -0,0 +1,43 @@ +##### http://autoconf-archive.cryp.to/ac_prog_javah.html +# +# SYNOPSIS +# +# AC_PROG_JAVAH +# +# DESCRIPTION +# +# AC_PROG_JAVAH tests the availability of the javah header generator +# and looks for the jni.h header file. If available, JAVAH is set to +# the full path of javah and CPPFLAGS is updated accordingly. +# +# LAST MODIFICATION +# +# 2002-03-25 +# +# COPYLEFT +# +# Copyright (c) 2002 Luc Maisonobe <luc@spaceroots.org> +# +# Copying and distribution of this file, with or without +# modification, are permitted in any medium without royalty provided +# the copyright notice and this notice are preserved. + +AC_DEFUN([AC_PROG_JAVAH],[ +AC_REQUIRE([AC_CANONICAL_SYSTEM])dnl +AC_REQUIRE([AC_PROG_CPP])dnl +test "x$JAVAH" = x && AC_CHECK_PROGS(JAVAH,gjavah gcjh javah) +if test "x$JAVAH" != x ; then + AC_TRY_CPP([#include <jni.h>],,[ + ac_save_CPPFLAGS="$CPPFLAGS" +changequote(, )dnl + ac_dir=`echo $ac_cv_path_JAVAH | sed 's,\(.*\)/[^/]*/[^/]*$,\1/include,'` + ac_machdep=`echo $build_os | sed 's,[-0-9].*,,' | sed 's,cygwin,win32,'` +changequote([, ])dnl + 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>])) + CPPFLAGS="$ac_save_CPPFLAGS"]) +else +true +fi]) |