search for: with_java

...else + +com_redhat_et_libguestfs_GuestFS.h: libguestfs-${VERSION}.jar + +endif + # Documentation. noinst_SCRIPTS = doc-stamp diff --git a/m4/guestfs-java.m4 b/m4/guestfs-java.m4 index 9d0f948b6..2ab932ac4 100644 --- a/m4/guestfs-java.m4 +++ b/m4/guestfs-java.m4 @@ -73,9 +73,7 @@ if test "x$with_java" != "xno"; then else JAVAC="$JAVA/bin/javac" fi - if test ! -x "$JAVA/bin/javah"; then - AC_MSG_ERROR([missing $JAVA/bin/javah binary]) - else + if test -x "$JAVA/bin/javah"; then...

This commit starts to split our massive, monolithic configure.ac file into smaller files, using the m4_include mechanism to combine them. I don't know if we should really do this, so I'm open to comments about it. However: - Our configure.ac script is 1800+ lines long, and that's pretty long. - configure.ac lacks structure; splitting it up might improve that. - From what I read,

...installed in java-MAJOR-openjdk directories, without any "default version" symlink. --- configure.ac | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configure.ac b/configure.ac index 1d93ca0..fa26924 100644 --- a/configure.ac +++ b/configure.ac @@ -1251,6 +1251,8 @@ if test "x$with_java" != "xno"; then for d in \ /usr/lib/jvm/java \ /usr/lib/jvm/default-java \ + /usr/lib/jvm/java-8-openjdk \ + /usr/lib/jvm/java-7-openjdk \ /usr/lib/jvm/java-6-openjdk do if test -d $d &&am...

...nce the location was already printed above. --- m4/guestfs_java.m4 | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/m4/guestfs_java.m4 b/m4/guestfs_java.m4 index 347cab6da..b86f0c423 100644 --- a/m4/guestfs_java.m4 +++ b/m4/guestfs_java.m4 @@ -50,9 +50,13 @@ if test "x$with_java" != "xno"; then /usr/lib/jvm/java-7-openjdk \ /usr/lib/jvm/java-6-openjdk do + AC_MSG_CHECKING([for 'java' in $d]) if test -d $d && test -f $d/bin/java; then + AC_MSG_RESULT([found])...

* Pino Toscano: > @@ -163,6 +161,7 @@ if test "x$with_java" != "xno"; then > AC_SUBST(JAR_INSTALL_DIR) > AC_SUBST(JNI_INSTALL_DIR) > AC_SUBST(JNI_VERSION_INFO) > + AM_CONDITIONAL([HAVE_JAVAH],[test -n "$JAVAH"]) > fi > > AM_CONDITIONAL([HAVE_JAVA],[test "x$with_java" != "xno...

On Sun, May 06, 2018 at 04:11:36PM +0200, Hilko Bengen wrote: > * Pino Toscano: > > > @@ -163,6 +161,7 @@ if test "x$with_java" != "xno"; then > > AC_SUBST(JAR_INSTALL_DIR) > > AC_SUBST(JNI_INSTALL_DIR) > > AC_SUBST(JNI_VERSION_INFO) > > + AM_CONDITIONAL([HAVE_JAVAH],[test -n "$JAVAH"]) > > fi > > > > AM_CONDITIONAL([HAVE_JAVA],[test &...

...igned-off-by: Martin Kletzander <mkletzan@redhat.com> --- m4/guestfs-java.m4 | 1 + 1 file changed, 1 insertion(+) diff --git a/m4/guestfs-java.m4 b/m4/guestfs-java.m4 index daa5af32d8bd..1ca9912b0630 100644 --- a/m4/guestfs-java.m4 +++ b/m4/guestfs-java.m4 @@ -46,6 +46,7 @@ if test "x$with_java" != "xno"; then /usr/lib64/jvm/java \ /usr/lib/jvm/default-java \ /usr/lib/jvm/default \ + /etc/java-config-2/current-system-vm \ /usr/lib/jvm/java-8-openjdk \ /usr/lib/jvm/java-7-openjdk \ /usr/...

Add sort of "headers" to split most of the logical sections of the configure, so it is easier to get feedback on the progress of configure. --- configure.ac | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/configure.ac b/configure.ac index 7f9c1dac0..5ccf6f821 100644 --- a/configure.ac +++ b/configure.ac @@ -76,11 +76,15 @@

...sier to extract the version inside the double quotes. --- m4/guestfs_java.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/m4/guestfs_java.m4 b/m4/guestfs_java.m4 index f9bec94..649e21f 100644 --- a/m4/guestfs_java.m4 +++ b/m4/guestfs_java.m4 @@ -84,7 +84,7 @@ if test "x$with_java" != "xno"; then else JAR="$JAVA/bin/jar" fi - java_version=`$JAVA_EXE -version 2>&1 | grep "java version"` + java_version=`$JAVA_EXE -version 2>&1 | $AWK -F '"' '/^(java|openjdk) version/...

...e ./configure with any extra javac flags that you want. --- m4/guestfs_java.m4 | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/m4/guestfs_java.m4 b/m4/guestfs_java.m4 index 649e21f..82cdc40 100644 --- a/m4/guestfs_java.m4 +++ b/m4/guestfs_java.m4 @@ -123,16 +123,6 @@ if test "x$with_java" != "xno"; then fi AC_MSG_RESULT([$JNI_CFLAGS]) - dnl Need extra version flag? - AC_MSG_CHECKING([extra javac flags]) - EXTRA_JAVAC_FLAGS= - javac_version=`$JAVAC -version 2>&1` - case "$javac_version" in -...

Two (not related to each other) refactorings: Patches 1-12 split configure.ac into smaller files using the m4_include mechanism. Patches 13-15 split out parts of guestfs.pod (ie. guestfs(3)) into three new manual pages: guestfs-hacking(3) - how to extend and contribute to libguestfs guestfs-internals(3) - architecture and internals guestfs-security(3) - security and CVEs Patch 16 is a