X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Fconfigure.in;h=4e877f7e1320a653b249a2e5950b723d1f487293;hb=5698740e7329b8a34faf0c178ff44a5e21654cdc;hp=116c6ae8318b058161d34c4779cd1980c299726a;hpb=5cec0a1533188970d5784a4ced8b127ab2366080;p=lttv.git

diff --git a/ltt/branches/poly/configure.in b/ltt/branches/poly/configure.in
index 116c6ae8..4e877f7e 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.6.2-20092005)
+AM_INIT_AUTOMAKE(LinuxTraceToolkitViewer,0.8.50-11072006)
 AM_CONFIG_HEADER(config.h)
 AM_PROG_LIBTOOL
 
@@ -45,9 +45,13 @@ AC_CHECK_LIB([popt], [poptGetNextOpt], POPT_LIBS="-lpopt",AC_MSG_ERROR([libpopt
 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
@@ -70,7 +74,7 @@ AC_HEADER_TIME
 
 # Checks for library functions.
 AC_FUNC_ERROR_AT_LINE
-AC_FUNC_MALLOC
+#AC_FUNC_MALLOC
 AC_FUNC_SELECT_ARGTYPES
 AC_CHECK_FUNCS([select])
 
@@ -79,11 +83,11 @@ 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"
 
-DEFAULT_INCLUDES="-I\$(top_srcdir) -I\$(top_lttvdir) -I\$(top_lttvwindowdir)"
+DEFAULT_INCLUDES="-I\$(top_srcdir) -I\$(top_builddir) -I\$(top_lttvdir) -I\$(top_lttvwindowdir)"
 
 #CPPFLAGS="${GLIB_CFLAGS}"
 #AC_SUBST(CPPFLAGS)
@@ -95,9 +99,10 @@ 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)
@@ -107,22 +112,23 @@ AC_SUBST(lttvwindowincludedir)
 AC_SUBST(lttctlincludedir)
 
 AC_CONFIG_FILES([Makefile
-     liblttctl/Makefile
-     lttctl/Makefile
 		 lttv/Makefile
 		 lttv/lttv/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/tutorial/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
+     		 lttv/modules/gui/histogram/Makefile
+                 lttv/modules/gui/filter/Makefile
+                 lttv/modules/gui/tracecontrol/Makefile
 		 ltt/Makefile
      doc/Makefile
      doc/developer/Makefile
@@ -132,6 +138,5 @@ AC_CONFIG_FILES([Makefile
      doc/user/Makefile
      doc/user/user_guide/Makefile
      doc/user/user_guide/docbook/Makefile
-     doc/user/user_guide/html/Makefile
-     facilities/Makefile])
+     doc/user/user_guide/html/Makefile])
 AC_OUTPUT