X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;ds=sidebyside;f=ltt%2Fbranches%2Fpoly%2Fconfigure.in;h=73f88761326a840b945bb569d70e64a74b314985;hb=ae3d0f50f89e7b965795a9b9ad7e1f533f760598;hp=a166264a24d4852a9bce12e2ac4a3e7c7fa558ef;hpb=2864f4c5ccd6f4d5401b40a05b4f4d816617a557;p=lttv.git

diff --git a/ltt/branches/poly/configure.in b/ltt/branches/poly/configure.in
index a166264a..73f88761 100644
--- a/ltt/branches/poly/configure.in
+++ b/ltt/branches/poly/configure.in
@@ -23,23 +23,35 @@
 AC_PREREQ(2.57)
 AC_INIT(FULL-PACKAGE-NAME, VERSION, BUG-REPORT-ADDRESS)
 #AC_WITH_LTDL  # not needed ?
-AM_INIT_AUTOMAKE(LinuxTraceToolkit,0.9.7-30092003)
+AM_INIT_AUTOMAKE(LinuxTraceToolkitViewer,0.8.27-05032006)
 AM_CONFIG_HEADER(config.h)
 AM_PROG_LIBTOOL
 
-AM_PATH_GLIB_2_0(2.0.0, ,AC_MSG_ERROR([glib is required in order to compile LinuxTraceToolkit - download it from ftp://ftp.gtk.org/pub/gtk]) , gmodule)
+AM_PATH_GLIB_2_0(2.4.0, ,AC_MSG_ERROR([glib is required in order to compile LinuxTraceToolkit - download it from ftp://ftp.gtk.org/pub/gtk]) , gmodule)
 
-AM_PATH_GTK_2_0(2.0.0, ,AC_MSG_ERROR([gtk is required in order to compile GUI - download it from ftp://ftp.gtk.org/pub/gtk]) , gmodule)
+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.
 AC_PROG_CC
 
 # Checks for libraries.
-AC_CHECK_LIB([popt], [poptGetNextOpt], ,AC_MSG_ERROR([libpopt is required in order to compile LinuxTraceToolkit])  )
+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
@@ -48,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)
 
@@ -67,52 +80,65 @@ AC_CHECK_FUNCS([select])
 
 #CPPFLAGS="$CPPFLAGS -I"
 
+AM_CONDITIONAL(LTTVSTATIC, test "$enable_lttvstatic" = yes)
 lttvlibdir="${libdir}/lttv"
-AC_SUBST(lttvlibdir)
-
 lttvplugindir="${lttvlibdir}/plugins"
-AC_SUBST(lttvplugindir)
-
-lttlibdir="${libdir}/ltt"
-AC_SUBST(lttlibdir)
-
-
+#lttlibdir="${libdir}/ltt"
 top_lttvdir="\$(top_srcdir)/lttv"
-AC_SUBST(top_lttvdir)
+top_lttvwindowdir="\$(top_srcdir)/lttv/modules/gui/lttvwindow"
 
-top_guidir="\$(top_srcdir)/lttv/modules/gui"
-AC_SUBST(top_guidir)
-
-DEFAULT_INCLUDES="-I\$(top_srcdir) -I\$(top_lttvdir) -I\$(top_guidir)"
-AC_SUBST(DEFAULT_INCLUDES)
+DEFAULT_INCLUDES="-I\$(top_srcdir) -I\$(top_lttvdir) -I\$(top_lttvwindowdir)"
 
 #CPPFLAGS="${GLIB_CFLAGS}"
 #AC_SUBST(CPPFLAGS)
 
 lttincludedir="${includedir}/ltt"
-AC_SUBST(lttincludedir)
-
 lttvincludedir="${includedir}/lttv"
-AC_SUBST(lttvincludedir)
+lttvwindowincludedir="${includedir}/lttvwindow"
+lttctlincludedir="${includedir}/liblttctl"
 
-lttvguiincludedir="${includedir}/lttvgui"
-AC_SUBST(lttvguiincludedir)
+AC_SUBST(POPT_LIBS)
+AC_SUBST(UTIL_LIBS)
+AC_SUBST(THREAD_LIBS)
+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)
 
 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/lttvgui/Makefile
 		 lttv/modules/gui/lttvwindow/Makefile
-		 lttv/modules/gui/lttvwindow/src/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/lttvwindow/glade/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
+     doc/developer/developer_guide/docbook/Makefile
+     doc/developer/developer_guide/html/Makefile
+     doc/user/Makefile
+     doc/user/user_guide/Makefile
+     doc/user/user_guide/docbook/Makefile
+     doc/user/user_guide/html/Makefile
+     facilities/Makefile])
 AC_OUTPUT