diff -r 6123e2454ad9 -r df5a8e49d157 Makefile.am --- a/Makefile.am Tue Apr 28 05:50:02 2009 -0400 +++ b/Makefile.am Tue Apr 28 16:53:58 2009 +0200 @@ -1161,6 +1161,11 @@ cp -r netbeans/nbbuild/netbeans_visualvm/profiler3 \ $(BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm endif +if ENABLE_SYSTEMTAP + mkdir -p $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset ; \ + cp $(abs_top_srcdir)/tapset/*.stp \ + $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset +endif cp $(abs_top_srcdir)/rt/net/sourceforge/jnlp/resources/about.jnlp \ extra-lib/about.jar \ $(BUILD_OUTPUT_DIR)/j2re-image/lib ; \ @@ -1228,6 +1233,11 @@ cp -r netbeans/nbbuild/netbeans_visualvm/profiler3 \ $(BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm endif +if ENABLE_SYSTEMTAP + mkdir -p $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset ; \ + cp $(abs_top_srcdir)/tapset/*.stp \ + $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset +endif cp $(abs_top_srcdir)/rt/net/sourceforge/jnlp/resources/default.jnlp \ extra-lib/about.jar \ $(BUILD_OUTPUT_DIR)-debug/j2re-image/lib ; \ diff -r 6123e2454ad9 -r df5a8e49d157 configure.ac --- a/configure.ac Tue Apr 28 05:50:02 2009 -0400 +++ b/configure.ac Tue Apr 28 16:53:58 2009 +0200 @@ -362,6 +362,23 @@ AC_CHECK_HEADER([sys/sdt.h], [SDT_H_FOUND='yes'], [SDT_H_FOUND='no'; AC_MSG_ERROR([systemtap support needs sys/sdt.h header])]) + + AC_MSG_CHECKING([for absolute java home install dir]) + AC_ARG_WITH([abs-install-dir], + [AS_HELP_STRING([--with-abs-install-dir], + [The absolute path where the j2sdk-image dir will be installed])], + [if test "x${withval}" = x; then + ABS_JAVA_HOME_DIR="`pwd`/openjdk/build/${BUILD_OS_DIR}-${BUILD_ARCH_DIR}/j2sdk-image" + else + ABS_JAVA_HOME_DIR="${withval}" + fi], [ABS_JAVA_HOME_DIR="`pwd`/openjdk/build/${BUILD_OS_DIR}-${BUILD_ARCH_DIR}/j2sdk-image"]) + AC_MSG_RESULT([${ABS_JAVA_HOME_DIR}]) + ABS_CLIENT_LIBJVM_SO="${ABS_JAVA_HOME_DIR}/jre/lib/${INSTALL_ARCH_DIR}/client/libjvm.so" + ABS_SERVER_LIBJVM_SO="${ABS_JAVA_HOME_DIR}/jre/lib/${INSTALL_ARCH_DIR}/server/libjvm.so" + AC_SUBST(ABS_JAVA_HOME_DIR) + AC_SUBST(ABS_CLIENT_LIBJVM_SO) + AC_SUBST(ABS_SERVER_LIBJVM_SO) + AC_CONFIG_FILES([tapset/hotspot.stp]) fi dnl Check for libpng headers and libraries.