X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=configure.ac;h=7415373190441e0e138b1091ef36ec99b1828bca;hb=2b4444ce6a9fa02ae46a67085c17aef55dc85941;hp=64ac088996fa948843e7a73a3510c955dfa3ed37;hpb=8e5cf0a992f91bb7e9a4e51897c86a88e0c99653;p=lttng-ust.git

diff --git a/configure.ac b/configure.ac
index 64ac0889..74153731 100644
--- a/configure.ac
+++ b/configure.ac
@@ -424,6 +424,15 @@ and installing the man pages.
 AM_CONDITIONAL([MAN_PAGES_OPT], [test "x$man_pages_opt" != "xno"])
 AM_CONDITIONAL([HAVE_ASCIIDOC_XMLTO], [test "x$have_asciidoc_xmlto" = "xyes"])
 
+# Default values
+AC_DEFUN([_AC_DEFINE_AND_SUBST], [
+	AC_DEFINE_UNQUOTED([CONFIG_$1], [$2], [$1])
+	$1="$2"
+	AC_SUBST([$1])
+])
+
+_AC_DEFINE_AND_SUBST([LTTNG_UST_DEFAULT_CONSTRUCTOR_TIMEOUT_MS], [3000])
+
 AC_CONFIG_FILES([
 	Makefile
 	doc/Makefile
@@ -441,7 +450,7 @@ AC_CONFIG_FILES([
 	liblttng-ust-java/Makefile
 	liblttng-ust-java-agent/Makefile
 	liblttng-ust-java-agent/java/Makefile
-	liblttng-ust-java-agent/java/liblttng-ust-agent/Makefile
+	liblttng-ust-java-agent/java/lttng-ust-agent-all/Makefile
 	liblttng-ust-java-agent/java/lttng-ust-agent-common/Makefile
 	liblttng-ust-java-agent/java/lttng-ust-agent-jul/Makefile
 	liblttng-ust-java-agent/java/lttng-ust-agent-log4j/Makefile