X-Git-Url: https://git.liburcu.org/?p=lttv.git;a=blobdiff_plain;f=configure.ac;h=02ae6853fbbaa198be2df94a5911635a595600df;hp=2af9ebecf9e887dda74c320bccadbf32ba85b496;hb=HEAD;hpb=451aaf275d421d71097d479eb0ae64fe908d8b6f diff --git a/configure.ac b/configure.ac index 2af9ebec..02ae6853 100644 --- a/configure.ac +++ b/configure.ac @@ -21,7 +21,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.57) -AC_INIT([lttv], [0.12.38-21032011], [yannick.brosseau@gmail.com]) +AC_INIT([lttv], [1.5], [yannick.brosseau@gmail.com]) AC_CONFIG_AUX_DIR([config]) AC_CONFIG_MACRO_DIR([config]) AM_INIT_AUTOMAKE([dist-bzip2 no-dist-gzip]) @@ -29,15 +29,15 @@ AM_SILENT_RULES([yes]) AC_CONFIG_HEADERS([config.h]) LT_INIT +#Always build basic command line modules +with_lttv="yes" + # If requested, avoid building LTTV part AC_ARG_WITH(lttv-gui, AS_HELP_STRING([--with-lttv-gui], [build LTTV gui, as opposed to only build textmode LTTV [[default=yes]]]), [with_lttv_gui="$withval"], [with_lttv_gui="yes"]) -#TODO ybrosseau 2012-03-13: Remove this when babeltrace port is complete -#Force GUI disabling while we port babeltrace -#with_lttv_gui="no" AM_CONDITIONAL([BUILD_LTTV_GUI], [ test "x$with_lttv_gui" = "xyes" ]) @@ -85,20 +85,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]) -# Check for JNI header files if requested -AC_ARG_WITH(jni-interface, - AS_HELP_STRING([--with-jni-interface], - [build JNI interface between C and Java. Needs JNI header file. [[default=no]]]), - [with_jni_interface="$withval"], - [with_jni_interface="no"]) - -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 CFLAGS=-I/path/ to specify a non-standard path or disable the JNI interface.])) -]) -AM_CONDITIONAL([BUILD_JNI_INTERFACE], [ test "$with_jni_interface" = "yes" ] ) - # If we want the gui, we need additionnal flags for GTK AS_IF([test "x$with_lttv_gui" = "xyes"],[ @@ -112,8 +98,22 @@ PKG_CHECK_MODULES(GMODULE, [$pkg_modules]) pkg_modules="gobject-2.0 >= 2.0.0" PKG_CHECK_MODULES(GOBJECT, [$pkg_modules]) -# Todo add test for babeltrace pkg-config -BABELTRACE_LIBS="-lbabeltrace -lbabeltrace-ctf" +PKG_CHECK_MODULES(BABELTRACE, [babeltrace >= 1.1.0], [], + [AC_CHECK_LIB([babeltrace], [bt_context_create], [], + [AC_MSG_ERROR([Cannot find the babeltrace library.])] + ) + +# Check for libbabeltrace-ctf +AC_CHECK_LIB([babeltrace-ctf], [bt_ctf_iter_create], [], + [AC_MSG_ERROR([Cannot find the babeltrace-ctf library.])] + ) +]) + +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" @@ -147,24 +147,20 @@ AM_CONDITIONAL([LTTVSTATIC], [ test "x$lttvstatic" = "xyes" ] ) lttvlibdir="${libdir}/lttv" lttvplugindir="${lttvlibdir}/plugins" -#lttlibdir="${libdir}/ltt" top_lttvdir="\$(top_srcdir)/lttv" top_lttvwindowdir="\$(top_srcdir)/lttv/modules/gui/lttvwindow" DEFAULT_INCLUDES="-I\$(top_srcdir) -I\$(top_builddir) -I\$(top_lttvdir) -I\$(top_lttvwindowdir)" -lttincludedir="${includedir}/ltt" lttvincludedir="${includedir}/lttv" lttvwindowincludedir="${includedir}/lttvwindow" lttctlincludedir="${includedir}/liblttctl" AC_SUBST(lttvlibdir) AC_SUBST(lttvplugindir) -#AC_SUBST(lttlibdir) AC_SUBST(top_lttvdir) AC_SUBST(top_lttvwindowdir) AC_SUBST(DEFAULT_INCLUDES) -AC_SUBST(lttincludedir) AC_SUBST(lttvincludedir) AC_SUBST(lttvwindowincludedir) AC_SUBST(lttctlincludedir) @@ -174,20 +170,15 @@ AC_SUBST(lttctlincludedir) AC_CONFIG_FILES([Makefile lttv/Makefile lttv/lttv/Makefile - lttv/lttv/sync/Makefile lttv/modules/Makefile lttv/modules/text/Makefile lttv/modules/gui/Makefile lttv/modules/gui/lttvwindow/Makefile - lttv/modules/gui/interrupts/Makefile lttv/modules/gui/lttvwindow/lttvwindow/Makefile lttv/modules/gui/lttvwindow/pixmaps/Makefile lttv/modules/gui/controlflow/Makefile lttv/modules/gui/detailedevents/Makefile - lttv/modules/gui/statistics/Makefile lttv/modules/gui/histogram/Makefile - lttv/modules/gui/filter/Makefile - lttv/modules/gui/tracecontrol/Makefile lttv/modules/gui/resourceview/Makefile doc/Makefile doc/developer/Makefile @@ -198,13 +189,18 @@ AC_CONFIG_FILES([Makefile doc/user/user_guide/Makefile doc/user/user_guide/docbook/Makefile doc/user/user_guide/html/Makefile]) +# lttv/lttv/sync/Makefile +# lttv/modules/gui/interrupts/Makefile +# lttv/modules/gui/statistics/Makefile +# lttv/modules/gui/filter/Makefile +# lttv/modules/gui/tracecontrol/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")]) @@ -215,9 +211,6 @@ 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")])