X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Fconfigure.in;h=bdbc2e8affa130fa42349f230a263f13a9c51d9c;hb=5ac76b2296e074afbf06358a7ffb1603f8c7593a;hp=638a52b751135c79a62d0c37b70b7d98d2660da3;hpb=0c56e138e63986d8a8c0d7fc3e2c7230a020289e;p=lttv.git

diff --git a/ltt/branches/poly/configure.in b/ltt/branches/poly/configure.in
index 638a52b7..bdbc2e8a 100644
--- a/ltt/branches/poly/configure.in
+++ b/ltt/branches/poly/configure.in
@@ -67,6 +67,7 @@ AC_CHECK_FUNCS([select])
 
 #CPPFLAGS="$CPPFLAGS -I"
 
+AM_CONDITIONAL(LTTVSTATIC, test "$enable_lttvstatic" = yes)
 lttvlibdir="${libdir}/lttv"
 AC_SUBST(lttvlibdir)
 
@@ -80,10 +81,10 @@ AC_SUBST(lttlibdir)
 top_lttvdir="\$(top_srcdir)/lttv"
 AC_SUBST(top_lttvdir)
 
-top_guidir="\$(top_srcdir)/lttv/modules/gui"
-AC_SUBST(top_guidir)
+top_lttvwindowdir="\$(top_srcdir)/lttv/modules/gui/lttvwindow"
+AC_SUBST(top_lttvwindowdir)
 
-DEFAULT_INCLUDES="-I\$(top_srcdir) -I\$(top_lttvdir) -I\$(top_guidir)"
+DEFAULT_INCLUDES="-I\$(top_srcdir) -I\$(top_lttvdir) -I\$(top_lttvwindowdir)"
 AC_SUBST(DEFAULT_INCLUDES)
 
 #CPPFLAGS="${GLIB_CFLAGS}"
@@ -95,8 +96,8 @@ AC_SUBST(lttincludedir)
 lttvincludedir="${includedir}/lttv"
 AC_SUBST(lttvincludedir)
 
-lttvguiincludedir="${includedir}/lttvgui"
-AC_SUBST(lttvguiincludedir)
+lttvwindowincludedir="${includedir}/lttvwindow"
+AC_SUBST(lttvwindowincludedir)
 
 AC_CONFIG_FILES([Makefile
 		 lttv/Makefile
@@ -104,11 +105,10 @@ AC_CONFIG_FILES([Makefile
 		 lttv/modules/Makefile
 		 lttv/modules/text/Makefile
 		 lttv/modules/gui/Makefile
-		 lttv/modules/gui/lttvgui/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/lttvwindow/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