X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Fconfigure.in;h=96c100add0cc47ee8eafe45ae88b1d741bccf098;hb=442137a6a4ff3f394fd83558dd7626f36d11c11a;hp=9a4150c0d050f7d483973eadee1f0cb3ae358ebc;hpb=ead838a85bef2f9f240f236e4e6c9666653a9a86;p=lttv.git

diff --git a/ltt/branches/poly/configure.in b/ltt/branches/poly/configure.in
index 9a4150c0..96c100ad 100644
--- a/ltt/branches/poly/configure.in
+++ b/ltt/branches/poly/configure.in
@@ -3,20 +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)
-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)
+
+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.
-# 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_MSG_ERROR([libpopt is required in order to compile LinuxTraceToolkit])  )
 
 # Checks for header files.
 AC_HEADER_STDC
@@ -38,11 +38,37 @@ 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/modules/Makefile
+		 lttv/modules/gui/Makefile
+#		 lttv/modules/gui/API/Makefile
+ 		 lttv/modules/text/Makefile
                  lttv/plugins/Makefile
-		 lttd/Makefile])
+		 lttv/plugins/examples/Makefile
+		 lttd/Makefile
+		 ltt/Makefile
+		 include/Makefile
+		 include/ltt/Makefile
+		 include/ltt/convert/Makefile
+		 include/lttv/Makefile])
 AC_OUTPUT