X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Fconfigure.in;h=3d9f8761531272c7109fb3aea94c79194c1847e5;hb=96cbee09f8701ff8eb088af3ad79b812b3022c8f;hp=860c2940ce95c3aecd17846893dab1a073e748b7;hpb=94ec763790b1784412383217115ffacc6be8fa32;p=lttv.git

diff --git a/ltt/branches/poly/configure.in b/ltt/branches/poly/configure.in
index 860c2940..3d9f8761 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
@@ -38,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}"
@@ -60,6 +76,10 @@ AC_SUBST(lttincludedir)
 AC_CONFIG_FILES([Makefile
      lttv/Makefile
 		 lttv/modules/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