Look for java headers in the "more" official /usr/lib/jvm/java/include

(rather than just the default include path)

This change is apparently because of a move to Sun's openjdk, and away from libgcj, now that Sun's Java is sufficiently open.

See RH Bug #486045

diff --git a/configure.ac b/configure.ac
index b1335a68c4224e14f1cc584b03029406f54e30a3..7d382986c65bf41c8a236b2a27d47100a6e95634 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -724,13 +724,19 @@ else
        case "${host_os}" in
          *darwin* )
             JAVA_INCLUDES="-I/System/Library/Frameworks/JavaVM.framework/Headers"
-           JAVA_LIBS=
+           JAVE_LIBS=
            ;;
          *)
-            JAVA_INCLUDES=
-           JAVA_LIBS=
+            JAVA_INCLUDES="-I/usr/lib/jvm/java/include -I/usr/lib/jvm/java/include/linux"
+           JAVE_LIBS=
            ;;
         esac
+        AC_ARG_WITH(javaincludedir,
+           [AS_HELP_STRING([--with-javaincludedir=DIR],[use JAVA includes from DIR])],
+          [JAVA_INCLUDES="-I$withval"])
+        AC_ARG_WITH(javalibdir,
+          [AS_HELP_STRING([--with-javalibdir=DIR],[use JAVA libraries from DIR])],
+          [JAVA_LIBS="$withval"])
        save_CPPFLAGS=$CPPFLAGS
         CPPFLAGS="$CPPFLAGS $JAVA_INCLUDES"
         AC_CHECK_HEADER(jni.h,,[

diff --git a/graphviz.spec.in b/graphviz.spec.in
index d595aac81ec3a54e4a9b6df95b6e08df19531abf..61cf626be90686a9928aed52f4f6576c516e1c23 100644 (file)
--- a/graphviz.spec.in
+++ b/graphviz.spec.in
@@ -208,9 +208,6 @@ BuildRequires: ghostscript-devel
 #define MING 1
 #BuildRequires: ming ming-devel
 %endif
-%if %fedora >= 11
-BuildRequires: libgcj-devel
-%endif
 %endif
 
 #-- AT&T-internal Fedora specific Build Requirements --------------------------------------
@@ -277,9 +274,6 @@ BuildRequires: ghostscript-devel
 #define MING 1
 #BuildRequires: ming ming-devel
 %endif
-%if %att_fedora >= 11
-BuildRequires: libgcj-devel
-%endif
 %endif
 
 #-- main graphviz rpm ------------------------------------------------