projects
/
lttng-ust.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JUL: install documentation and jar file
[lttng-ust.git]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index 7edbc9f2227e66b9c559246f79daf15e6a9b3d27..1eda569c9caba4e738b60ede2621a71168d2c4a0 100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-1,7
+1,7
@@
# -*- Autoconf -*-
# Process this file with autoconf to produce a configure script.
# -*- Autoconf -*-
# Process this file with autoconf to produce a configure script.
-AC_INIT([lttng-ust],[2.3.0
-rc2
],[mathieu dot desnoyers at efficios dot com])
+AC_INIT([lttng-ust],[2.3.0],[mathieu dot desnoyers at efficios dot com])
# Following the numbering scheme proposed by libtool for the library version
# http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
# Following the numbering scheme proposed by libtool for the library version
# http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
@@
-209,6
+209,9
@@
AC_ARG_WITH([java-jdk],
[JAVA_JDK=$withval],
[JAVA_JDK=""]
)
[JAVA_JDK=$withval],
[JAVA_JDK=""]
)
+AM_CONDITIONAL([HAVE_JAVA_JDK], [test $JAVA_JDK], [Java JDK path])
+AC_SUBST([JAVA_JDK])
+
AS_IF([test $JAVA_JDK],[
AS_IF([test -d $JAVA_JDK],[
AC_MSG_RESULT([using Java includes in $JAVA_SDK])
AS_IF([test $JAVA_JDK],[
AS_IF([test -d $JAVA_JDK],[
AC_MSG_RESULT([using Java includes in $JAVA_SDK])
@@
-270,6
+273,9
@@
AC_ARG_WITH([lttng-system-rundir],
AC_DEFINE_UNQUOTED([LTTNG_SYSTEM_RUNDIR], ["$lttng_system_rundir"],
[LTTng system runtime directory])
AC_DEFINE_UNQUOTED([LTTNG_SYSTEM_RUNDIR], ["$lttng_system_rundir"],
[LTTng system runtime directory])
+lttnglibjavadir="${libdir}/lttng/java"
+AC_SUBST(lttnglibjavadir)
+
AC_CONFIG_FILES([
Makefile
doc/Makefile
AC_CONFIG_FILES([
Makefile
doc/Makefile
@@
-282,7
+288,10
@@
AC_CONFIG_FILES([
liblttng-ust/Makefile
liblttng-ust-ctl/Makefile
liblttng-ust-fork/Makefile
liblttng-ust/Makefile
liblttng-ust-ctl/Makefile
liblttng-ust-fork/Makefile
+ liblttng-ust-baddr/Makefile
+ liblttng-ust-dl/Makefile
liblttng-ust-java/Makefile
liblttng-ust-java/Makefile
+ liblttng-ust-jul/Makefile
liblttng-ust-libc-wrapper/Makefile
liblttng-ust-cyg-profile/Makefile
tools/Makefile
liblttng-ust-libc-wrapper/Makefile
liblttng-ust-cyg-profile/Makefile
tools/Makefile
@@
-293,6
+302,7
@@
AC_CONFIG_FILES([
tests/snprintf/Makefile
tests/benchmark/Makefile
tests/utils/Makefile
tests/snprintf/Makefile
tests/benchmark/Makefile
tests/utils/Makefile
+ tests/java-jul/Makefile
lttng-ust.pc
])
lttng-ust.pc
])
This page took
0.024146 seconds
and
4
git commands to generate.