X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=configure.ac;h=23430881d2594df61a9f5b65538c215de4a3dd83;hb=e40cdd19296a4fbacf0738fb3671f6d0503d9e99;hp=416cd86187db5109a9586878e977fc71608210d9;hpb=2e589766126f5d4d3ac6fc01122eb684a12da47e;p=lttv.git

diff --git a/configure.ac b/configure.ac
index 416cd861..23430881 100644
--- a/configure.ac
+++ b/configure.ac
@@ -29,19 +29,6 @@ AM_SILENT_RULES([yes])
 AC_CONFIG_HEADERS([config.h])
 LT_INIT
 
-# If requested, only build the ltt trace reading library
-AC_ARG_WITH(lttv,
-	AS_HELP_STRING([--with-lttv],
-	[build whole LTTV system, as opposd to only the trace reading library [[default=yes]]]),
-	[with_lttv="$withval"],
-	[with_lttv="yes"])
-
-# If we've requested the lib only, turn off the lttv-gui building as well
-AS_IF([test "x$with_lttv" = "xno"], [with_lttv_gui="no"])
-
-AM_CONDITIONAL([BUILD_LIB_ONLY], [ test "x$with_lttv" = "xno" ])
-
-
 # If requested, avoid building LTTV part
 AC_ARG_WITH(lttv-gui,
 	AS_HELP_STRING([--with-lttv-gui],
@@ -95,26 +82,6 @@ AS_IF([test "x$with_trace_sync" = "xyes"],[
 AC_HEADER_STDC
 AC_CHECK_HEADERS([fcntl.h stdlib.h string.h sys/time.h unistd.h pthread.h])
 
-# Set compile flags to java include files if given
-AC_ARG_WITH([java-jdk],
-	AS_HELP_STRING([--with-java-jdk=DIR],
-	[use java jdk from DIR. Ex : $JAVA_HOME.]),
-	[JAVA_SDK=$withval],
-	[])
-
-AS_IF([test $JAVA_SDK],[
-	AS_IF([test -d $JAVA_SDK],[
-		AC_MSG_RESULT([using java include in $JAVA_SDK])
-		SUBDIRS=`find $JAVA_SDK/include -type d`
-		CFLAGS+=" "
-		CFLAGS+=`for x in $SUBDIRS; do echo -n "-I$x "; done`
-		CFLAGS+=" "
-        ],[
-                AC_MSG_ERROR([Unable to find Java include files in $JAVA_JDK])
-        ])
-])
-
-
 # Check for JNI header files if requested
 AC_ARG_WITH(jni-interface,
 	AS_HELP_STRING([--with-jni-interface],
@@ -125,7 +92,7 @@ AC_ARG_WITH(jni-interface,
 AS_IF([test "x$with_jni_interface" = "xyes"],[
         AC_CHECK_HEADERS([jni.h], [], AC_MSG_ERROR([missing jni.h
 Make sure Sun Java or OpenJDK or GCJ is installed and that this header file exists in the system path.
-Use --with-java-jdk=DIR flag to point to your java include files or deactivate the JNI interface.]))
+Use CFLAGS=-I/path/ to specify a non-standard path or disable the JNI interface.]))
 ])
 AM_CONDITIONAL([BUILD_JNI_INTERFACE], [ test "$with_jni_interface" = "yes" ] )
 
@@ -134,18 +101,25 @@ AM_CONDITIONAL([BUILD_JNI_INTERFACE], [ test "$with_jni_interface" = "yes" ] )
 AS_IF([test "x$with_lttv_gui" = "xyes"],[
 	pkg_modules="gtk+-2.0 >= 2.0.0"
 	PKG_CHECK_MODULES(PACKAGE, [$pkg_modules])
-],[
-	# Else, we still have a dependency on gmodule
-	# We will add flags for gmodule alone
-	pkg_modules="gmodule-2.0 >= 2.0.0"
-	PKG_CHECK_MODULES(GMODULE, [$pkg_modules])
 ])
 
+pkg_modules="gmodule-2.0 >= 2.0.0"
+PKG_CHECK_MODULES(GMODULE, [$pkg_modules])
+
 pkg_modules="gobject-2.0 >= 2.0.0"
 PKG_CHECK_MODULES(GOBJECT, [$pkg_modules])
 
-LIBS="$LIBS $GTK_LIBS $GOBJECT_LIBS $GMODULE_LIBS"
+PKG_CHECK_MODULES(BABELTRACE, [babeltrace >= 1.0.0])
+
+AC_CHECK_LIB([babeltrace], [bt_iter_equals_pos], 
+			   [AC_DEFINE([HAVE_BT_ITER_EQUALS_POS],[],[Have equal function])], [])
+
+AC_CHECK_LIB([babeltrace-ctf], [bt_ctf_event_name], 
+			   [], [AC_MSG_ERROR([libbabeltrace-ctf is required in order to compile LTTV])])
+
+LIBS="$LIBS $GTK_LIBS $GOBJECT_LIBS $GMODULE_LIBS $BABELTRACE_LIBS"
 PACKAGE_CFLAGS="$GTK_CFLAGS $GOBJECT_CFLAGS $GMODULE_CFLAGS -Wall -Wformat-security"
+
 MODULE_CFLAGS="$PACKAGE_CFLAGS -fvisibility=hidden"
 MODULE_LDFLAGS="-module -avoid-version"
 AC_SUBST([PACKAGE_CFLAGS])
@@ -169,9 +143,9 @@ AC_CHECK_FUNCS([select])
 AC_ARG_ENABLE(lttvstatic,
 	AS_HELP_STRING([--enable-lttvstatic],
 	[build a statically linked executable [[default=no]]]),
-	[with_lttvstatic="$withval"],
-	[with_lttvstatic="no"])
-AM_CONDITIONAL([LTTVSTATIC], [ test "x$with_lttvstatic" = "xyes" ] )
+	[lttvstatic="$enableval"],
+	[lttvstatic="no"])
+AM_CONDITIONAL([LTTVSTATIC], [ test "x$lttvstatic" = "xyes" ] )
 
 lttvlibdir="${libdir}/lttv"
 lttvplugindir="${lttvlibdir}/plugins"
@@ -197,6 +171,8 @@ AC_SUBST(lttvincludedir)
 AC_SUBST(lttvwindowincludedir)
 AC_SUBST(lttctlincludedir)
 
+#	ltt/Makefile
+
 AC_CONFIG_FILES([Makefile
 	lttv/Makefile
 	lttv/lttv/Makefile
@@ -215,7 +191,6 @@ AC_CONFIG_FILES([Makefile
 	lttv/modules/gui/filter/Makefile
 	lttv/modules/gui/tracecontrol/Makefile
 	lttv/modules/gui/resourceview/Makefile
-	ltt/Makefile
 	doc/Makefile
 	doc/developer/Makefile
 	doc/developer/developer_guide/Makefile
@@ -228,3 +203,27 @@ AC_CONFIG_FILES([Makefile
 
 AC_OUTPUT
 
+# Report on what will be built
+AS_ECHO()
+AS_ECHO("The following components will be built:")
+AS_ECHO("LTT trace reading library: Enabled") # It's always enabled!
+
+AS_ECHO_N("LTTV command line tool:    ")
+AS_IF([test "x$with_lttv" = "xyes"],[AS_ECHO("Enabled")],[AS_ECHO("Disabled")])
+
+AS_ECHO_N("LTTV graphical interface:  ")
+AS_IF([test "x$with_lttv_gui" = "xyes"],[AS_ECHO("Enabled")],[AS_ECHO("Disabled")])
+
+AS_ECHO_N("Trace synchronization:     ")
+AS_IF([test "x$with_trace_sync" = "xyes"],[AS_ECHO("Enabled")],[AS_ECHO("Disabled")])
+
+AS_ECHO_N("Java (JNI) interface:      ")
+AS_IF([test "x$with_jni_interface" = "xyes"],[AS_ECHO("Enabled")],[AS_ECHO("Disabled")])
+
+AS_ECHO()
+AS_ECHO_N("Statically linked executable: ")
+AS_IF([test "x$lttvstatic" = "xyes"],[AS_ECHO("Yes")],[AS_ECHO("No")])
+
+AS_ECHO()
+AS_ECHO("Type 'make' to build LTTV.")
+