apply tim fixes

[lttv.git] / ltt / branches / poly / configure.in

diff --git a/ltt/branches/poly/configure.in b/ltt/branches/poly/configure.in
index e87211e91e85b67e28b5cd11aebf2d50568b443a..2e3c730655f9dd25c020914e439886fcaad64431 100644 (file)
--- 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.8.8-30012006)
+AM_INIT_AUTOMAKE(LinuxTraceToolkitViewer,0.8.48-21062006)
 AM_CONFIG_HEADER(config.h)
 AM_PROG_LIBTOOL
 
@@ -47,7 +47,7 @@ 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]))
+#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
@@ -74,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])
 
@@ -87,7 +87,7 @@ lttvplugindir="${lttvlibdir}/plugins"
 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)
@@ -112,8 +112,6 @@ AC_SUBST(lttvwindowincludedir)
 AC_SUBST(lttctlincludedir)
 
 AC_CONFIG_FILES([Makefile
-     liblttctl/Makefile
-     lttctl/Makefile
                 lttv/Makefile
                 lttv/lttv/Makefile
                 lttv/modules/Makefile
@@ -127,9 +125,10 @@ AC_CONFIG_FILES([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
+                 lttv/modules/gui/tutorial/Makefile
                 ltt/Makefile
      doc/Makefile
      doc/developer/Makefile
@@ -139,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