[libgda/LIBGDA_5.2] JDBC: Fixes for JDBC provider

[Daniel Espinosa Ortiz <despinosa src gnome org>]

commit da2bb94f7155d9e3739ada71fbf9f64c1639b1a5
Author: Daniel Espinosa <esodan gmail com>
Date:   Tue Jul 31 18:08:46 2018 -0500

    JDBC: Fixes for JDBC provider

 m4/java.m4                 | 1 -
 providers/jdbc/Makefile.am | 6 +++---
 tools/irb.js               | 0
 tools/mouseapp_2.js        | 0
 tools/mouseirb_2.js        | 0
 5 files changed, 3 insertions(+), 4 deletions(-)
---
diff --git a/m4/java.m4 b/m4/java.m4
index dc1e12183..f4e64e9af 100644
--- a/m4/java.m4
+++ b/m4/java.m4
@@ -111,7 +111,6 @@ m4_define([_JAVA_CHECK_INTERNAL],
        AC_MSG_CHECKING([if all java programs are found])
        AC_PATH_PROGS(JAVA_PROG,java,,${JAVA_PATH})
        AC_PATH_PROGS(JAVAC,javac,,${JAVA_PATH})
-       AC_PATH_PROGS(JAVAH,javah,,${JAVA_PATH})
        AC_PATH_PROGS(JAR,jar,,${JAVA_PATH})
 
        have_all_java=yes
diff --git a/providers/jdbc/Makefile.am b/providers/jdbc/Makefile.am
index 6488d9df8..e02bc723c 100644
--- a/providers/jdbc/Makefile.am
+++ b/providers/jdbc/Makefile.am
@@ -75,8 +75,8 @@ jdbc-resources.h jdbc-resources.c: $(srcdir)/jdbc.gresource.xml Makefile $(shell
 
 CLEANFILES = $(resources)
 
-$(jni_headers): $(jdbcprov_classes)
-       $(JAVAH) -classpath . -d $(builddir) -force `basename $@ | sed -e 's/\.h$$//'`
+$(jni_headers): $(jdbcprov_sources)
+       $(JAVAC) -classpath . -h $(builddir) $^
 
 jdbcprov_jar = gdaprovider-5.0.jar
 jdbcprov_sources = \
@@ -91,7 +91,7 @@ jdbcprovdir = $(providerdir)
 jdbcprov_DATA = $(jdbcprov_jar)
 
 GdaJConnection.class: $(jdbcprov_sources)
-       $(JAVAC) -cp . $(JFLAGS) -d $(top_builddir)/providers/jdbc $^
+       $(JAVAC) -cp . $(JFLAGS) -d $(top_builddir)/providers/jdbc -classpath $(builddir) -h $(builddir) $^
 
 $(jdbcprov_jar): $(jdbcprov_classes)
        $(JAR) cfm $(jdbcprov_jar) $(top_srcdir)/providers/jdbc/MANIFEST.MF *.class
diff --git a/tools/irb.js b/tools/irb.js
old mode 100755
new mode 100644
diff --git a/tools/mouseapp_2.js b/tools/mouseapp_2.js
old mode 100755
new mode 100644
diff --git a/tools/mouseirb_2.js b/tools/mouseirb_2.js
old mode 100755
new mode 100644