From 40930dac68deca53d9948f1618215650973e1a41 Mon Sep 17 00:00:00 2001
From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Fri, 26 Aug 2011 07:31:32 -0400
Subject: [PATCH] Fix java build

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
---
 Makefile.am                      | 2 +-
 configure.ac                     | 4 ++--
 {java => libustjava}/.gitignore  | 0
 {java => libustjava}/Makefile.am | 0
 {java => libustjava}/README      | 3 ---
 {java => libustjava}/UST.c       | 0
 {java => libustjava}/UST.java    | 0
 {java => libustjava}/ust_java.h  | 0
 8 files changed, 3 insertions(+), 6 deletions(-)
 rename {java => libustjava}/.gitignore (100%)
 rename {java => libustjava}/Makefile.am (100%)
 rename {java => libustjava}/README (84%)
 rename {java => libustjava}/UST.c (100%)
 rename {java => libustjava}/UST.java (100%)
 rename {java => libustjava}/ust_java.h (100%)

diff --git a/Makefile.am b/Makefile.am
index f294cf35..79ff7535 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,7 +6,7 @@ ACLOCAL_AMFLAGS = -I config
 # must be installed after libust so it can overwrite libust.so with
 # the linker script.
 SUBDIRS = snprintf liblttng-ust-comm libringbuffer libust include doc tests \
-		java
+		libustjava
 
 #temporarily disabled
 # . libustinstr-malloc libustfork
diff --git a/configure.ac b/configure.ac
index dbfdecde..90021593 100644
--- a/configure.ac
+++ b/configure.ac
@@ -160,7 +160,7 @@ fi
 if test "$with_jni_interface" = "yes"; then
         AC_CHECK_HEADERS([jni.h],,AC_MSG_ERROR([
 missing jni.h
-Make sure Sun Java, OpenJDK or GCJ is installed and that this header file exists in the system path.
+Make sure Sun Java or OpenJDK or GCJ is installed and that this header file exists in the system path.
 Use --with-java-jdk=DIR flag to point to your java include files or desactivate the JNI interface.]))
 fi
 AM_CONDITIONAL(BUILD_JNI_INTERFACE, test "$with_jni_interface" = "yes")
@@ -197,6 +197,6 @@ AC_CONFIG_FILES([
 	snprintf/Makefile
 	ust.pc
 	include/ust/version.h
-	java/Makefile
+	libustjava/Makefile
 ])
 AC_OUTPUT
diff --git a/java/.gitignore b/libustjava/.gitignore
similarity index 100%
rename from java/.gitignore
rename to libustjava/.gitignore
diff --git a/java/Makefile.am b/libustjava/Makefile.am
similarity index 100%
rename from java/Makefile.am
rename to libustjava/Makefile.am
diff --git a/java/README b/libustjava/README
similarity index 84%
rename from java/README
rename to libustjava/README
index ecc27ef6..37834e69 100644
--- a/java/README
+++ b/libustjava/README
@@ -10,6 +10,3 @@ dependency: openjdk-6-jdk
 
 dependency: gcj-4.4-jdk
 ./configure --with-java-jdk=/usr/lib/jvm/java-gcj --with-jni-interface
-
-Our testing shows that sun java6 and openjdk 6 build fine, but not gcj
-4.4.
diff --git a/java/UST.c b/libustjava/UST.c
similarity index 100%
rename from java/UST.c
rename to libustjava/UST.c
diff --git a/java/UST.java b/libustjava/UST.java
similarity index 100%
rename from java/UST.java
rename to libustjava/UST.java
diff --git a/java/ust_java.h b/libustjava/ust_java.h
similarity index 100%
rename from java/ust_java.h
rename to libustjava/ust_java.h
-- 
2.34.1