X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Fconfigure.in;h=bb4e2c88074fb4fd3b753a10024223f2b770da71;hb=0b74aa8307516c05e7f8d99a7df12384dcabc53d;hp=a166264a24d4852a9bce12e2ac4a3e7c7fa558ef;hpb=2864f4c5ccd6f4d5401b40a05b4f4d816617a557;p=lttv.git

diff --git a/ltt/branches/poly/configure.in b/ltt/branches/poly/configure.in
index a166264a..bb4e2c88 100644
--- a/ltt/branches/poly/configure.in
+++ b/ltt/branches/poly/configure.in
@@ -27,15 +27,17 @@ 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)
+AM_PATH_GLIB_2_0(2.4.0, ,AC_MSG_ERROR([glib is required in order to compile LinuxTraceToolkit - download it from ftp://ftp.gtk.org/pub/gtk]) , gmodule)
 
-AM_PATH_GTK_2_0(2.0.0, ,AC_MSG_ERROR([gtk is required in order to compile GUI - download it from ftp://ftp.gtk.org/pub/gtk]) , gmodule)
+AM_PATH_GTK_2_0(2.4.0, ,AC_MSG_ERROR([gtk is required in order to compile GUI - download it from ftp://ftp.gtk.org/pub/gtk]) , gmodule)
 
 # Checks for programs.
 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])  )
+AC_CHECK_LIB([m], [round], POPT_LIBS+=" -lm",AC_MSG_ERROR([Mathematical libraries are missing.])  )
+
 
 # Checks for header files.
 AC_HEADER_STDC
@@ -67,36 +69,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"
-AC_SUBST(top_lttvdir)
+top_lttvwindowdir="\$(top_srcdir)/lttv/modules/gui/lttvwindow"
 
-top_guidir="\$(top_srcdir)/lttv/modules/gui"
-AC_SUBST(top_guidir)
-
-DEFAULT_INCLUDES="-I\$(top_srcdir) -I\$(top_lttvdir) -I\$(top_guidir)"
-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
@@ -104,9 +103,8 @@ AC_CONFIG_FILES([Makefile
 		 lttv/modules/Makefile
 		 lttv/modules/text/Makefile
 		 lttv/modules/gui/Makefile
-		 lttv/modules/gui/lttvgui/Makefile
 		 lttv/modules/gui/lttvwindow/Makefile
-		 lttv/modules/gui/lttvwindow/src/Makefile
+		 lttv/modules/gui/lttvwindow/lttvwindow/Makefile
 		 lttv/modules/gui/lttvwindow/pixmaps/Makefile
 		 lttv/modules/gui/lttvwindow/glade/Makefile
 		 lttv/modules/gui/controlflow/Makefile