diff options
| -rw-r--r-- | configure.ac | 10 | ||||
| -rw-r--r-- | java/Makefile.am | 2 | ||||
| -rw-r--r-- | java/examples/Makefile.am | 2 |
3 files changed, 9 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index 6c971c0e..500bf405 100644 --- a/configure.ac +++ b/configure.ac @@ -1104,20 +1104,20 @@ if test "x$with_java_home" != "xno"; then dnl Need extra version flag? AC_MSG_CHECKING([extra javac flags]) - JAVAC_FLAGS= + EXTRA_JAVAC_FLAGS= javac_version=`$JAVAC -version 2>&1` case "$javac_version" in *Eclipse*) - JAVAC_FLAGS="-source 1.5" ;; + EXTRA_JAVAC_FLAGS="-source 1.5" ;; esac - AC_MSG_RESULT([$JAVAC_FLAGS]) + AC_MSG_RESULT([$EXTRA_JAVAC_FLAGS]) dnl Extra lint flags? AC_MSG_CHECKING([extra javac lint flags]) if $JAVAC -X >/dev/null 2>&1 && \ $JAVAC -X 2>&1 | grep -q -- '-Xlint:.*all'; then AC_MSG_RESULT([-Xlint:all]) - JAVAC_FLAGS="$JAVAC_FLAGS -Xlint:all" + EXTRA_JAVAC_FLAGS="$EXTRA_JAVAC_FLAGS -Xlint:all" else AC_MSG_RESULT([no]) fi @@ -1145,7 +1145,7 @@ AC_SUBST(JAVAH) AC_SUBST(JAVADOC) AC_SUBST(JAR) AC_SUBST(JNI_CFLAGS) -AC_SUBST(JAVAC_FLAGS) +AC_SUBST(EXTRA_JAVAC_FLAGS) AC_SUBST(JAR_INSTALL_DIR) AC_SUBST(JNI_INSTALL_DIR) AC_SUBST(JNI_VERSION_INFO) diff --git a/java/Makefile.am b/java/Makefile.am index 07faf0f8..03e08127 100644 --- a/java/Makefile.am +++ b/java/Makefile.am @@ -52,6 +52,8 @@ CLEANFILES = doc-stamp $(builddir)/com/redhat/et/libguestfs/*.class com_redhat_e if HAVE_JAVA +JAVAC_FLAGS = $(EXTRA_JAVAC_FLAGS) + # Java source. libguestfs_jardir = $(JAR_INSTALL_DIR) diff --git a/java/examples/Makefile.am b/java/examples/Makefile.am index 15d20d82..3ba251ee 100644 --- a/java/examples/Makefile.am +++ b/java/examples/Makefile.am @@ -44,6 +44,8 @@ if HAVE_JAVA noinst_SCRIPTS = CreateDisk.class InspectVM.class +JAVAC_FLAGS = $(EXTRA_JAVAC_FLAGS) + %.class: %.java $(JAVAC) $(JAVAC_FLAGS) -classpath ../libguestfs-$(VERSION).jar $< |