X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Fconfigure.in;h=00f2a526cbffb9e249209ca2dcf101066b2a1164;hb=dd4a271d6e271a026c072a38ee28c165149daff8;hp=2eaa4279e65fc45cd32cae6621d560a6f4ad626b;hpb=31303917da2b647d166d1ae63f361de55ee25b09;p=lttv.git

diff --git a/ltt/branches/poly/configure.in b/ltt/branches/poly/configure.in
index 2eaa4279..00f2a526 100644
--- a/ltt/branches/poly/configure.in
+++ b/ltt/branches/poly/configure.in
@@ -4,12 +4,14 @@
 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-29052003)
-AM_CONFIG_HEADER([config.h])
+AM_INIT_AUTOMAKE(LinuxTraceToolkit,0.9.7-30092003)
+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_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)
+
 # Checks for programs.
 AC_PROG_CC
 
@@ -20,6 +22,16 @@ AC_CHECK_LIB([popt], [poptGetNextOpt], ,AC_MSG_ERROR([libpopt is required in ord
 AC_HEADER_STDC
 AC_CHECK_HEADERS([fcntl.h stdlib.h string.h sys/time.h unistd.h])
 
+AC_ISC_POSIX
+AC_PROG_CC
+AM_PROG_CC_STDC
+AC_HEADER_STDC
+
+pkg_modules="gtk+-2.0 >= 2.0.0"
+PKG_CHECK_MODULES(PACKAGE, [$pkg_modules])
+AC_SUBST(PACKAGE_CFLAGS)
+AC_SUBST(PACKAGE_LIBS)
+
 # Checks for typedefs, structures, and compiler characteristics.
 AC_HEADER_STDBOOL
 AC_C_CONST
@@ -36,14 +48,20 @@ AC_CHECK_FUNCS([select])
 
 #CPPFLAGS="$CPPFLAGS -I"
 
-lttvplugindir="${libdir}/lttv/plugins"
+lttvlibdir="${libdir}/lttv"
+AC_SUBST(lttvlibdir)
+
+lttvplugindir="${lttvlibdir}/plugins"
 AC_SUBST(lttvplugindir)
 
 lttlibdir="${libdir}/ltt"
 AC_SUBST(lttlibdir)
 
 
-DEFAULT_INCLUDES="-I\$(top_srcdir)/include"
+top_includedir="\$(top_srcdir)/include"
+AC_SUBST(top_includedir)
+
+DEFAULT_INCLUDES="-I\$(top_includedir) -I\$(top_srcdir)"
 AC_SUBST(DEFAULT_INCLUDES)
 
 #CPPFLAGS="${GLIB_CFLAGS}"
@@ -56,15 +74,23 @@ lttincludedir="${includedir}/ltt"
 AC_SUBST(lttincludedir)
 
 AC_CONFIG_FILES([Makefile
-                 lttv/Makefile
+		 lttv/Makefile
+		 lttv/main/Makefile
 		 lttv/modules/Makefile
-		 lttv/modules/gui/Makefile
 		 lttv/modules/text/Makefile
-                 lttv/plugins/Makefile
-		 lttv/plugins/examples/Makefile
+		 lttv/modules/gui/Makefile
+		 lttv/modules/gui/mainlib/Makefile
+		 lttv/modules/gui/main/Makefile
+		 lttv/modules/gui/main/src/Makefile
+		 lttv/modules/gui/main/pixmaps/Makefile
+		 lttv/modules/gui/icons/Makefile
+		 lttv/modules/gui/ControlFlow/Makefile
+		 lttv/modules/gui/DetailedEvents/Makefile
+		 lttv/modules/gui/Statistics/Makefile
 		 lttd/Makefile
 		 ltt/Makefile
 		 include/Makefile
 		 include/ltt/Makefile
+		 ltt/convert/Makefile
 		 include/lttv/Makefile])
 AC_OUTPUT