X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;ds=sidebyside;f=ltt%2Fbranches%2Fpoly%2Fconfigure.in;h=c0a00e8384d3a4e83f73c45114176fb180540170;hb=b00eda448b8e4cb3bff4894f7578eb06499aca49;hp=7b701b459325c55ca058a15f1482786f0697b459;hpb=9f14a49763ebc267de8d3a8d543b8e195ac60a02;p=lttv.git

diff --git a/ltt/branches/poly/configure.in b/ltt/branches/poly/configure.in
index 7b701b45..c0a00e83 100644
--- a/ltt/branches/poly/configure.in
+++ b/ltt/branches/poly/configure.in
@@ -4,17 +4,18 @@
 AC_PREREQ(2.57)
 AC_INIT(FULL-PACKAGE-NAME, VERSION, BUG-REPORT-ADDRESS)
 AM_INIT_AUTOMAKE(LinuxTraceToolkit,0.9.7-29052003)
-AC_CONFIG_HEADER([config.h])
-AC_PROG_LIBTOOL
+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)
 
 # Checks for programs.
 AC_PROG_CC
 
 # Checks for libraries.
-# MD : here or at the Makefile level ?
-#AC_CHECK_LIB([popt], [poptGetNextOpt])
+AC_CHECK_LIB([popt], [poptGetNextOpt])
 #AC_CHECK_LIB([gmodule-2.0], [g_module_open])
-#AC_CHECK_LIB([dl], [dlopen])
+AC_CHECK_LIB([dl], [dlopen])
 #AC_CHECK_LIB([glib-2.0], [g_malloc])
 
 # Checks for header files.
@@ -37,10 +38,35 @@ AC_CHECK_FUNCS([select])
 
 #CPPFLAGS="$CPPFLAGS -I"
 
-lttplugindir="${libdir}/ltt/plugins"
-AC_SUBST(lttplugindir)
+lttvplugindir="${libdir}/lttv/plugins"
+AC_SUBST(lttvplugindir)
+
+lttlibdir="${libdir}/ltt"
+AC_SUBST(lttlibdir)
+
+
+DEFAULT_INCLUDES="-I\$(top_srcdir)/include"
+AC_SUBST(DEFAULT_INCLUDES)
+
+#CPPFLAGS="${GLIB_CFLAGS}"
+#AC_SUBST(CPPFLAGS)
+
+lttvincludedir="${includedir}/lttv"
+AC_SUBST(lttvincludedir)
+
+lttincludedir="${includedir}/ltt"
+AC_SUBST(lttincludedir)
 
 AC_CONFIG_FILES([Makefile
                  lttv/Makefile
-                 lttv/plugins/Makefile])
+		 lttv/modules/Makefile
+		 lttv/modules/gui/Makefile
+		 lttv/modules/text/Makefile
+                 lttv/plugins/Makefile
+		 lttv/plugins/examples/Makefile
+		 lttd/Makefile
+		 ltt/Makefile
+		 include/Makefile
+		 include/ltt/Makefile
+		 include/lttv/Makefile])
 AC_OUTPUT