X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Fconfigure.in;h=96c100add0cc47ee8eafe45ae88b1d741bccf098;hb=59460ee38a3ccc39e6d1babff35243bb12cdd392;hp=3e911a7927ab646cffb44db609ae5bde32d5fd23;hpb=aefa856911702bc59082a1f6002b9c057f52a4b8;p=lttv.git

diff --git a/ltt/branches/poly/configure.in b/ltt/branches/poly/configure.in
index 3e911a79..96c100ad 100644
--- a/ltt/branches/poly/configure.in
+++ b/ltt/branches/poly/configure.in
@@ -3,19 +3,20 @@
 
 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_CONFIG_HEADER([config.h])
 AM_PROG_LIBTOOL
-AM_PATH_GLIB_2_0
+
+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_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)
 
 # Checks for programs.
 AC_PROG_CC
 
 # Checks for libraries.
-AC_CHECK_LIB([popt], [poptGetNextOpt])
-AC_CHECK_LIB([gmodule-2.0], [g_module_open])
-AC_CHECK_LIB([dl], [dlopen])
-AC_CHECK_LIB([glib-2.0], [g_malloc])
+AC_CHECK_LIB([popt], [poptGetNextOpt], ,AC_MSG_ERROR([libpopt is required in order to compile LinuxTraceToolkit])  )
 
 # Checks for header files.
 AC_HEADER_STDC
@@ -44,9 +45,12 @@ lttlibdir="${libdir}/ltt"
 AC_SUBST(lttlibdir)
 
 
-DEFAULT_INCLUDES="-I\$(top_srcdir)/include -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include"
+DEFAULT_INCLUDES="-I\$(top_srcdir)/include"
 AC_SUBST(DEFAULT_INCLUDES)
 
+#CPPFLAGS="${GLIB_CFLAGS}"
+#AC_SUBST(CPPFLAGS)
+
 lttvincludedir="${includedir}/lttv"
 AC_SUBST(lttvincludedir)
 
@@ -57,12 +61,14 @@ AC_CONFIG_FILES([Makefile
                  lttv/Makefile
 		 lttv/modules/Makefile
 		 lttv/modules/gui/Makefile
-		 lttv/modules/text/Makefile
+#		 lttv/modules/gui/API/Makefile
+ 		 lttv/modules/text/Makefile
                  lttv/plugins/Makefile
 		 lttv/plugins/examples/Makefile
 		 lttd/Makefile
 		 ltt/Makefile
 		 include/Makefile
 		 include/ltt/Makefile
+		 include/ltt/convert/Makefile
 		 include/lttv/Makefile])
 AC_OUTPUT