diff options
| author | Richard W.M. Jones <rjones@redhat.com> | 2012-07-23 15:18:12 +0100 |
|---|---|---|
| committer | Richard W.M. Jones <rjones@redhat.com> | 2012-08-05 22:48:52 +0100 |
| commit | 96ae727a4eeb51f2d4aa6c940a03fe382224ceb4 (patch) | |
| tree | 5f2f1df48f9c93e040a91f0ac7d37c65b342ff1a | |
| parent | 2d3d09f16fc6a0b7ed41a94b09bdc7753f6f7da2 (diff) | |
| download | libguestfs-96ae727a4eeb51f2d4aa6c940a03fe382224ceb4.tar.gz libguestfs-96ae727a4eeb51f2d4aa6c940a03fe382224ceb4.tar.xz libguestfs-96ae727a4eeb51f2d4aa6c940a03fe382224ceb4.zip | |
java: JAVAC_FLAGS -> EXTRA_JAVAC_FLAGS.
This is just a rename.
(cherry picked from commit 7f519bdc06de978c2460112a88e8bfac5f292dee)
| -rw-r--r-- | configure.ac | 8 | ||||
| -rw-r--r-- | java/Makefile.am | 2 | ||||
| -rw-r--r-- | java/examples/Makefile.am | 2 |
3 files changed, 8 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 23885852..abbed876 100644 --- a/configure.ac +++ b/configure.ac @@ -1007,13 +1007,13 @@ 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 Where to install jarfiles, jnifiles if test -z $JAR_INSTALL_DIR; then @@ -1038,7 +1038,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 613aac92..f4d1fec6 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 $< |