mars_nwe/mars-flaim
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Modified FLM_PROG_TRY_JNI so it uses a flm variable instead of an ac variable.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/flaim/code/trunk@1109 0109f412-320b-0410-ab79-c3e0c5ffbbe6
This commit is contained in:
jcalcote
2009-08-12 23:32:32 +00:00
parent 62fc7e082f
commit cc6f53b5cc
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
xflaim/configure.ac
View File

@@ -36,7 +36,7 @@ AC_ARG_ENABLE([debug],
[debug="$withval"], [debug=no])
# Automake conditionals
AM_CONDITIONAL([HAVE_JAVA], [test "x$ac_prog_have_jni" = xyes])
AM_CONDITIONAL([HAVE_JAVA], [test "x$flm_prog_have_jni" = xyes])
AM_CONDITIONAL([HAVE_CSHARP], [test -n "$CSC"])
AM_CONDITIONAL([HAVE_DOXYGEN], [test -n "$DOXYGEN"])
#AM_COND_IF([HAVE_DOXYGEN], [AC_CONFIG_FILES([docs/doxygen/doxyfile])])

10
xflaim/m4/flm_prog_try_jni.m4
View File

@@ -31,11 +31,11 @@ FLM_PROG_TRY_JAVAC([quiet])dnl
FLM_PROG_TRY_JAVAH([quiet])dnl
FLM_PROG_TRY_JAR([quiet])dnl
ifelse([$1],,
[ac_prog_have_jni=yes
if test -z "$JAVAC"; then ac_prog_have_jni=no; fi
if test -z "$JAVAH"; then ac_prog_have_jni=no; fi
if test -z "$JAR"; then ac_prog_have_jni=no; fi
if test "x$ac_prog_have_jni" = xno; then
[flm_prog_have_jni=yes
if test -z "$JAVAC"; then flm_prog_have_jni=no; fi
if test -z "$JAVAH"; then flm_prog_have_jni=no; fi
if test -z "$JAR"; then flm_prog_have_jni=no; fi
if test "x$flm_prog_have_jni" = xno; then
AC_MSG_WARN([Some required JNI tools are missing - continuing without JNI support])
fi], [$1], [quiet],, [m4_fatal([Invalid option '$1' in $0])])
])# FLM_PROG_TRY_JNI