File libgda-5.2.4-nojavah.patch of Package libgda
--- libgda-5.2.4/m4/java.m4 2018-01-08 13:12:26.228444544 +0100
+++ libgda-5.2.4/m4/java.m4 2018-01-08 13:13:52.932444872 +0100
@@ -111,13 +111,11 @@
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
if test -z "$JAVA_PROG"; then have_all_java=no; fi
if test -z "$JAVAC"; then have_all_java=no; fi
- if test -z "$JAVAH"; then have_all_java=no; fi
if test -z "$JAR"; then have_all_java=no; fi
if test ${have_all_java} = no; then
AC_MSG_WARN([one or more Java tools are missing (JRE is not sufficient)])
--- libgda-5.2.4/providers/jdbc/Makefile.am 2018-01-08 13:12:26.180444544 +0100
+++ libgda-5.2.4/providers/jdbc/Makefile.am 2018-01-08 13:16:14.224008270 +0100
@@ -76,7 +76,6 @@
CLEANFILES = $(resources)
$(jni_headers): $(jdbcprov_classes)
- $(JAVAH) -classpath . -d $(builddir) -force `basename $@ | sed -e 's/\.h$$//'`
jdbcprov_jar = gdaprovider-5.0.jar
jdbcprov_sources = \
@@ -91,7 +90,7 @@
jdbcprov_DATA = $(jdbcprov_jar)
GdaJConnection.class: $(jdbcprov_sources)
- $(JAVAC) -cp . $(JFLAGS) -d $(top_builddir)/providers/jdbc $^
+ $(JAVAC) -cp . $(JFLAGS) -d $(top_builddir)/providers/jdbc -h $(builddir) $^
$(jdbcprov_jar): $(jdbcprov_classes)
$(JAR) cfm $(jdbcprov_jar) $(top_srcdir)/providers/jdbc/MANIFEST.MF *.class