X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Fconfigure.in;h=a5c06af105bd69df34e88df0ef5decb8aa7655b5;hb=b3fd4c02566c71add135fbc715fddafc9b03b141;hp=6fc1571dc65b36b71c8fd44635411e397d394f3a;hpb=2cdb6fcba2deb41e6e894cae0f46d9a58a8c9e85;p=lttv.git

diff --git a/ltt/branches/poly/configure.in b/ltt/branches/poly/configure.in
index 6fc1571d..a5c06af1 100644
--- a/ltt/branches/poly/configure.in
+++ b/ltt/branches/poly/configure.in
@@ -23,7 +23,7 @@
 AC_PREREQ(2.57)
 AC_INIT(FULL-PACKAGE-NAME, VERSION, BUG-REPORT-ADDRESS)
 #AC_WITH_LTDL  # not needed ?
-AM_INIT_AUTOMAKE(LinuxTraceToolkitViewer,0.4-02022005)
+AM_INIT_AUTOMAKE(LinuxTraceToolkitViewer,0.8.13-07022006)
 AM_CONFIG_HEADER(config.h)
 AM_PROG_LIBTOOL
 
@@ -31,6 +31,8 @@ AM_PATH_GLIB_2_0(2.4.0, ,AC_MSG_ERROR([glib is required in order to compile Linu
 
 AM_PATH_GTK_2_0(2.4.0, ,AC_MSG_ERROR([gtk is required in order to compile GUI - download it from ftp://ftp.gtk.org/pub/gtk]) , gmodule)
 
+AC_PATH_PROGS(BASH, bash)
+
 AC_SYS_LARGEFILE
 
 # Checks for programs.
@@ -40,10 +42,16 @@ AC_PROG_CC
 AC_CHECK_LIB([popt], [poptGetNextOpt], POPT_LIBS="-lpopt",AC_MSG_ERROR([libpopt is required in order to compile LinuxTraceToolkit])  )
 #AC_CHECK_LIB([m], [round], M_LIBS="-lm",AC_MSG_ERROR([Mathematical libraries are missing.])  )
 
+AC_CHECK_LIB([util], [forkpty], UTIL_LIBS="-lutil", AC_MSG_ERROR([libutil is
+required in order to compile LinuxTraceToolkit]))
+
+
+# pthread for lttd
+AC_CHECK_LIB(pthread, pthread_join,[THREAD_LIBS="-lpthread"], AC_MSG_ERROR([LinuxThreads is required in order to compile lttd]))
 
 # Checks for header files.
 AC_HEADER_STDC
-AC_CHECK_HEADERS([fcntl.h stdlib.h string.h sys/time.h unistd.h])
+AC_CHECK_HEADERS([fcntl.h stdlib.h string.h sys/time.h unistd.h pthread.h])
 
 AC_ISC_POSIX
 AC_PROG_CC
@@ -52,6 +60,7 @@ AC_HEADER_STDC
 
 pkg_modules="gtk+-2.0 >= 2.0.0"
 PKG_CHECK_MODULES(PACKAGE, [$pkg_modules])
+PACKAGE_CFLAGS="-Wall -Wformat"
 AC_SUBST(PACKAGE_CFLAGS)
 AC_SUBST(PACKAGE_LIBS)
 
@@ -74,7 +83,7 @@ AC_CHECK_FUNCS([select])
 AM_CONDITIONAL(LTTVSTATIC, test "$enable_lttvstatic" = yes)
 lttvlibdir="${libdir}/lttv"
 lttvplugindir="${lttvlibdir}/plugins"
-lttlibdir="${libdir}/ltt"
+#lttlibdir="${libdir}/ltt"
 top_lttvdir="\$(top_srcdir)/lttv"
 top_lttvwindowdir="\$(top_srcdir)/lttv/modules/gui/lttvwindow"
 
@@ -86,21 +95,24 @@ DEFAULT_INCLUDES="-I\$(top_srcdir) -I\$(top_lttvdir) -I\$(top_lttvwindowdir)"
 lttincludedir="${includedir}/ltt"
 lttvincludedir="${includedir}/lttv"
 lttvwindowincludedir="${includedir}/lttvwindow"
-
+lttctlincludedir="${includedir}/liblttctl"
 
 AC_SUBST(POPT_LIBS)
+AC_SUBST(UTIL_LIBS)
+AC_SUBST(THREAD_LIBS)
 AC_SUBST(lttvlibdir)
 AC_SUBST(lttvplugindir)
-AC_SUBST(lttlibdir)
+#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)
 
 AC_CONFIG_FILES([Makefile
-     libltt/Makefile
+     liblttctl/Makefile
      lttctl/Makefile
 		 lttv/Makefile
 		 lttv/lttv/Makefile
@@ -108,15 +120,17 @@ AC_CONFIG_FILES([Makefile
 		 lttv/modules/text/Makefile
 		 lttv/modules/gui/Makefile
 		 lttv/modules/gui/lttvwindow/Makefile
+		 lttv/modules/gui/interrupts/Makefile
+		 lttv/modules/gui/diskperformance/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/filter/Makefile
+     lttv/modules/gui/tracecontrol/Makefile
 		 lttd/Makefile
 		 ltt/Makefile
-		 ltt/convert/Makefile
      doc/Makefile
      doc/developer/Makefile
      doc/developer/developer_guide/Makefile
@@ -125,5 +139,6 @@ AC_CONFIG_FILES([Makefile
      doc/user/Makefile
      doc/user/user_guide/Makefile
      doc/user/user_guide/docbook/Makefile
-     doc/user/user_guide/html/Makefile])
+     doc/user/user_guide/html/Makefile
+     facilities/Makefile])
 AC_OUTPUT