X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Fconfigure.in;h=47c2e7f99f63c348d063d74ac3e26efd8a31eca2;hb=abd9940940056663c20e55848f7a1532178d3a65;hp=11b4cd79c85eb8920142f4a6f03eaa5f2079d9e8;hpb=39407106534aab611204d035dc17678da25bcd28;p=lttv.git

diff --git a/ltt/branches/poly/configure.in b/ltt/branches/poly/configure.in
index 11b4cd79..47c2e7f9 100644
--- a/ltt/branches/poly/configure.in
+++ b/ltt/branches/poly/configure.in
@@ -4,19 +4,19 @@
 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])
+AM_CONFIG_HEADER([config.h])
 AC_PROG_LIBTOOL
 AM_PROG_LIBTOOL
+AM_PATH_GLIB_2_0
 
 # Checks for programs.
 AC_PROG_CC
 
 # Checks for libraries.
-# MD : here or at the Makefile level ?
-#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_CHECK_LIB([gmodule-2.0], [g_module_open])
+AC_CHECK_LIB([dl], [dlopen])
+AC_CHECK_LIB([glib-2.0], [g_malloc])
 
 # Checks for header files.
 AC_HEADER_STDC
@@ -38,10 +38,32 @@ 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)
+
+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