enhancements and bugfixes

[lttv.git] / ltt / branches / poly / configure.in

diff --git a/ltt/branches/poly/configure.in b/ltt/branches/poly/configure.in
index f245ffd3f1afaa194577c93ef6d5276969bb655d..29a7a3f7e1d73a59fe26ff7bd1f0800dfc860910 100644 (file)
--- a/ltt/branches/poly/configure.in
+++ b/ltt/branches/poly/configure.in
@@ -35,7 +35,7 @@ AM_PATH_GTK_2_0(2.0.0, ,AC_MSG_ERROR([gtk is required in order to compile GUI -
 AC_PROG_CC
 
 # Checks for libraries.
-AC_CHECK_LIB([popt], [poptGetNextOpt], ,AC_MSG_ERROR([libpopt is required in order to compile LinuxTraceToolkit])  )
+AC_CHECK_LIB([popt], [poptGetNextOpt], POPT_LIBS="-lpopt",AC_MSG_ERROR([libpopt is required in order to compile LinuxTraceToolkit])  )
 
 # Checks for header files.
 AC_HEADER_STDC
@@ -67,33 +67,33 @@ AC_CHECK_FUNCS([select])
 
 #CPPFLAGS="$CPPFLAGS -I"
 
+AM_CONDITIONAL(LTTVSTATIC, test "$enable_lttvstatic" = yes)
 lttvlibdir="${libdir}/lttv"
-AC_SUBST(lttvlibdir)
-
 lttvplugindir="${lttvlibdir}/plugins"
-AC_SUBST(lttvplugindir)
-
 lttlibdir="${libdir}/ltt"
-AC_SUBST(lttlibdir)
+top_lttvdir="\$(top_srcdir)/lttv"
+top_lttvwindowdir="\$(top_srcdir)/lttv/modules/gui/lttvwindow"
 
-
-top_guidir="\$(top_srcdir)/lttv/modules/gui"
-AC_SUBST(top_guidir)
-
-DEFAULT_INCLUDES="-I\$(top_guidir) -I\$(top_srcdir)"
-AC_SUBST(DEFAULT_INCLUDES)
+DEFAULT_INCLUDES="-I\$(top_srcdir) -I\$(top_lttvdir) -I\$(top_lttvwindowdir)"
 
 #CPPFLAGS="${GLIB_CFLAGS}"
 #AC_SUBST(CPPFLAGS)
 
 lttincludedir="${includedir}/ltt"
-AC_SUBST(lttincludedir)
-
 lttvincludedir="${includedir}/lttv"
-AC_SUBST(lttvincludedir)
+lttvwindowincludedir="${includedir}/lttvwindow"
+
 
-lttvguiincludedir="${includedir}/lttvgui"
-AC_SUBST(lttvguiincludedir)
+AC_SUBST(POPT_LIBS)
+AC_SUBST(lttvlibdir)
+AC_SUBST(lttvplugindir)
+AC_SUBST(lttlibdir)
+AC_SUBST(top_lttvdir)
+AC_SUBST(top_lttvwindowdir)
+AC_SUBST(DEFAULT_INCLUDES)
+AC_SUBST(lttincludedir)
+AC_SUBST(lttvincludedir)
+AC_SUBST(lttvwindowincludedir)
 
 AC_CONFIG_FILES([Makefile
                 lttv/Makefile
@@ -101,11 +101,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