Changeset: 63508537616c for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=63508537616c
Modified Files:
configure.ag
java/embedded/Makefile.ag
Branch: embedded-java
Log Message:
Make it easier to compile on more machines
diffs (34 lines):
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -1696,7 +1696,8 @@ if test "x$have_java" != xno; then
have_java=no
why_have_java="(no javah found)"
else
- have_java=yes
+ have_java=yes
+ javah_CFLAGS="-I$JAVA_HOME/include -I`ls -d
$JAVA_HOME/include/*/`"
fi
if test "x$have_java" != xyes; then
@@ -1721,6 +1722,7 @@ AC_SUBST(JAVADOC)
AC_SUBST(JAVAH)
AC_SUBST(CLASSPATH)
AC_SUBST(JAVA_HOME)
+AC_SUBST(javah_CFLAGS)
org_have_java_jdbc=no
have_java_jdbc=$org_have_java_jdbc
diff --git a/java/embedded/Makefile.ag b/java/embedded/Makefile.ag
--- a/java/embedded/Makefile.ag
+++ b/java/embedded/Makefile.ag
@@ -33,8 +33,7 @@ INCLUDES = ../../tools/embedded \
../../sql/storage \
../../sql/storage/bat \
../../sql/backends/monet5 \
- -I$(JAVA_HOME)/include \
- -I$(JAVA_HOME)/include/darwin \
+ $(javah_CFLAGS) \
$(pcre_CFLAGS)
lib_embedded_java = {
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
