X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Fconfigure.in;h=47401b1c3ea62c1634d28630efb43d33abebcc49;hb=745b7254ea79830ff492586ade0f5912a5c29f0e;hp=90e12b0ffb7bc0419045e64d66d6223c8472dd74;hpb=388a40e919b4f45afc78aae141cfb33549bb0378;p=lttv.git

diff --git a/ltt/branches/poly/configure.in b/ltt/branches/poly/configure.in
index 90e12b0f..47401b1c 100644
--- a/ltt/branches/poly/configure.in
+++ b/ltt/branches/poly/configure.in
@@ -4,8 +4,8 @@
 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-06082003)
-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)
@@ -22,6 +22,12 @@ 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)
@@ -42,7 +48,10 @@ 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"
@@ -52,7 +61,7 @@ AC_SUBST(lttlibdir)
 top_includedir="\$(top_srcdir)/include"
 AC_SUBST(top_includedir)
 
-DEFAULT_INCLUDES="-I\$(top_includedir)"
+DEFAULT_INCLUDES="-I\$(top_includedir) -I\$(top_srcdir)"
 AC_SUBST(DEFAULT_INCLUDES)
 
 #CPPFLAGS="${GLIB_CFLAGS}"
@@ -65,8 +74,16 @@ lttincludedir="${includedir}/ltt"
 AC_SUBST(lttincludedir)
 
 AC_CONFIG_FILES([Makefile
-     lttv/Makefile
+		 lttv/Makefile
 		 lttv/modules/Makefile
+		 lttv/modules/gui/Makefile
+		 lttv/modules/gui/mainWin/Makefile
+		 lttv/modules/gui/mainWin/src/Makefile
+		 lttv/modules/gui/mainWin/pixmaps/Makefile
+		 lttv/modules/gui/API/Makefile
+		 lttv/modules/guiControlFlow/Makefile
+		 lttv/modules/icons/Makefile
+		 lttv/modules/guiStatistic/Makefile
 		 lttd/Makefile
 		 ltt/Makefile
 		 include/Makefile