[libgda] Allow JDBC provider to be built from outside the sources

[Vivien Malerba <vivien src gnome org>]

commit 49080e2d03b1259657f37d8f7f878296df856091
Author: Vivien Malerba <malerba gnome-db org>
Date:   Wed Feb 23 18:18:33 2011 +0100

    Allow JDBC provider to be built from outside the sources

 m4/java.m4                 |    8 ++++----
 providers/jdbc/Makefile.am |    5 +++--
 2 files changed, 7 insertions(+), 6 deletions(-)
---
diff --git a/m4/java.m4 b/m4/java.m4
index 6807350..0372910 100644
--- a/m4/java.m4
+++ b/m4/java.m4
@@ -133,7 +133,7 @@ m4_define([_JAVA_CHECK_INTERNAL],
 	acx_java_works=no
 	if test -n "${JAVA_PROG}"
 	then
-	    RUN_JAVA(acx_jc_result,[-classpath . getsp -test])
+	    RUN_JAVA(acx_jc_result,[-classpath ${srcdir} getsp -test])
 	    if test "${acx_jc_result}" = "Test1234OK"
 	    then
 	        acx_java_works=yes
@@ -189,7 +189,7 @@ m4_define([_JAVA_CHECK_INTERNAL],
 	        ## retrieve JAVA_HOME from Java itself if not set
 	        if test -z "${JAVA_HOME}"
 	        then
-	            RUN_JAVA(JAVA_HOME,[-classpath . getsp java.home])
+	            RUN_JAVA(JAVA_HOME,[-classpath ${srcdir} getsp java.home])
 	        fi
 
 	        ## the availability of JAVA_HOME will tell us whether it's supported
@@ -208,9 +208,9 @@ m4_define([_JAVA_CHECK_INTERNAL],
 	                    JAVA_LD_PATH=
 	                    ;;
 	                *)
-	                    RUN_JAVA(JAVA_LIBS, [-classpath . getsp -libs])
+	                    RUN_JAVA(JAVA_LIBS, [-classpath ${srcdir} getsp -libs])
 	                    JAVA_LIBS="${JAVA_LIBS} -ljvm"
-	           	    RUN_JAVA(JAVA_LD_PATH, [-classpath . getsp java.library.path])
+	           	    RUN_JAVA(JAVA_LD_PATH, [-classpath ${srcdir} getsp java.library.path])
 	           	    ;;
 	            esac
 	            # note that we actually don't test JAVA_LIBS - we hope that the detection
diff --git a/providers/jdbc/Makefile.am b/providers/jdbc/Makefile.am
index afb6b7a..d5c55ae 100644
--- a/providers/jdbc/Makefile.am
+++ b/providers/jdbc/Makefile.am
@@ -30,6 +30,7 @@ jni_headers = $(jni_sources:.c=.h)
 jni_classes = $(jni_sources:.c=.class) 
 
 $(jni_sources): $(jni_headers)
+path_jni_sources = $(addprefix $(srcdir)/,$(jni_sources))
 
 libgda_jdbc_la_SOURCES = \
 	gda-jdbc-blob-op.c \
@@ -51,7 +52,7 @@ libgda_jdbc_la_SOURCES = \
 	jni-globals.h \
 	jni-wrapper.h \
 	jni-wrapper.c \
-	$(jni_sources) \
+	$(path_jni_sources) \
 	$(jni_headers)
 
 
@@ -70,7 +71,7 @@ endif
 
 
 $(jni_headers): $(jdbcprov_classes)
-	$(JAVAH) -classpath . -force `echo $@ | sed -e 's/\.h$$//'`
+	$(JAVAH) -classpath . -force `basename $@ | sed -e 's/\.h$$//'`
 
 jdbcprov_jar = gdaprovider-4.0.jar
 jdbcprov_sources = \