Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- Index: swig/java/java.opt
- ===================================================================
- --- swig/java/java.opt (revision 26749)
- +++ swig/java/java.opt (working copy)
- @@ -1,7 +1,7 @@
- #
- # Java Stuff
- #JAVA_HOME = "C:\Program Files\Java\jdk1.6.0_16"
- -JAVA_HOME = /usr/lib/jvm/java-6-openjdk/
- +#JAVA_HOME = /usr/lib/jvm/java-6-openjdk/
- JAVADOC=$(JAVA_HOME)/bin/javadoc
- JAVAC=$(JAVA_HOME)/bin/javac
- JAVA=$(JAVA_HOME)/bin/java
- Index: swig/java/GNUmakefile
- ===================================================================
- --- swig/java/GNUmakefile (revision 26749)
- +++ swig/java/GNUmakefile (working copy)
- @@ -88,3 +88,11 @@
- %.$(OBJ_EXT): %.c
- $(CC) -fno-strict-aliasing $(CFLAGS) $(GDAL_INCLUDE) $(JAVA_INCLUDE) -c $<
- +
- +info:
- + @echo JAVA_HOME ${JAVA_HOME}
- + @echo JAVAC ${JAVAC}
- + @echo JAVA ${JAVA}
- + @echo JAR ${JAR}
- + @echo JAVA_INCLUDE ${JAVA_INCLUDE}
- + @echo JAVA_INC ${JAVA_INC}
- Index: GDALmake.opt.in
- ===================================================================
- --- GDALmake.opt.in (revision 26749)
- +++ GDALmake.opt.in (working copy)
- @@ -455,6 +455,7 @@
- #
- # Java stuff
- #
- +JAVA_HOME = @JAVA_HOME@
- JAVA_INC = @JAVA_INC@
- JVM_LIB = @JVM_LIB@
- Index: configure
- ===================================================================
- --- configure (revision 26749)
- +++ configure (working copy)
- @@ -28487,8 +28487,8 @@
- +$as_echo "JAVA SECTION"
- -
- # Check whether --with-java was given.
- if test "${with_java+set}" = set; then :
- withval=$with_java;
- @@ -28601,7 +28601,7 @@
- else
- as_fn_error $? "\"Cannot find $with_java/include or <mac_java_framework>/Headers directory.\"" "$LINENO" 5
- fi
- -
- + BINDINGS="java $BINDINGS"
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- @@ -28611,6 +28611,8 @@
- JAVA_INC=$JAVA_INC
- +$as_echo "JAVA_HOME: $JAVA_HOME"
- +$as_echo "JAVA_INC: $JAVA_INC"
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement