X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Fconfigure.in;h=58b7b4c313d18175bcbfafb8c412f39dbd28a04a;hb=4371ee30a92c37fe9f8fcd23d5d14a526ec6e6fa;hp=ab618a1a245bc12fdaa6338acc2472c4dfe2288b;hpb=f60d7a471b36f2ba0c4937cd6c9badc7567a3b33;p=lttv.git

diff --git a/ltt/branches/poly/configure.in b/ltt/branches/poly/configure.in
index ab618a1a..58b7b4c3 100644
--- a/ltt/branches/poly/configure.in
+++ b/ltt/branches/poly/configure.in
@@ -4,7 +4,7 @@
 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_INIT_AUTOMAKE(LinuxTraceToolkit,0.9.7-06082003)
 AM_CONFIG_HEADER([config.h])
 AM_PROG_LIBTOOL
 
@@ -22,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
@@ -45,7 +55,10 @@ 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}"
@@ -60,8 +73,10 @@ AC_SUBST(lttincludedir)
 AC_CONFIG_FILES([Makefile
      lttv/Makefile
 		 lttv/modules/Makefile
-		 lttv/modules/examples/Makefile
-		 lttv/modules/coreGUI/Makefile
+		 lttv/modules/gui/Makefile
+		 lttv/modules/gui/mainWin/Makefile
+		 lttv/modules/gui/mainWin/src/Makefile
+		 lttv/modules/gui/API/Makefile
 		 lttd/Makefile
 		 ltt/Makefile
 		 include/Makefile
@@ -69,9 +84,11 @@ AC_CONFIG_FILES([Makefile
 		 ltt/convert/Makefile
 		 include/lttv/Makefile])
 AC_OUTPUT
+#		 lttv/modules/examples/Makefile
 #		 include/ltt/convert/Makefile
 #		 lttv/modules/gui/API/Makefile
 #		 lttv/modules/gui/Makefile
 # 		 lttv/modules/text/Makefile
 #		 lttv/plugins/Makefile
 #		 lttv/plugins/examples/Makefile
+#		 lttv/modules/coreGUI/Makefile