From cc6f53b5cc246a14dbe37a13dd0b4b773d659d02 Mon Sep 17 00:00:00 2001
From: jcalcote <jcalcote@0109f412-320b-0410-ab79-c3e0c5ffbbe6>
Date: Wed, 12 Aug 2009 23:32:32 +0000
Subject: [PATCH] Modified FLM_PROG_TRY_JNI so it uses a flm variable instead
 of an ac variable.

git-svn-id: https://svn.code.sf.net/p/flaim/code/trunk@1109 0109f412-320b-0410-ab79-c3e0c5ffbbe6
---
 xflaim/configure.ac           |  2 +-
 xflaim/m4/flm_prog_try_jni.m4 | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/xflaim/configure.ac b/xflaim/configure.ac
index 212137d..a3a77f1 100644
--- a/xflaim/configure.ac
+++ b/xflaim/configure.ac
@@ -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])])
diff --git a/xflaim/m4/flm_prog_try_jni.m4 b/xflaim/m4/flm_prog_try_jni.m4
index d24547e..22cf729 100644
--- a/xflaim/m4/flm_prog_try_jni.m4
+++ b/xflaim/m4/flm_prog_try_jni.m4
@@ -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