fix to use AM_PATH_GLIB_2_0

[lttv.git] / ltt / branches / poly / configure.in

diff --git a/ltt/branches/poly/configure.in b/ltt/branches/poly/configure.in
index 6c0b48fc1e890ea227d5032e7b63abe509c5eb6d..c0a00e8384d3a4e83f73c45114176fb180540170 100644 (file)
--- a/ltt/branches/poly/configure.in
+++ b/ltt/branches/poly/configure.in
@@ -4,18 +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])
-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.
 AC_CHECK_LIB([popt], [poptGetNextOpt])
-AC_CHECK_LIB([gmodule-2.0], [g_module_open])
+#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([glib-2.0], [g_malloc])
 
 # Checks for header files.
 AC_HEADER_STDC
@@ -37,14 +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/modules/Makefile
+                lttv/modules/gui/Makefile
+                lttv/modules/text/Makefile
                  lttv/plugins/Makefile
-                lttd/Makefile])
+                lttv/plugins/examples/Makefile
+                lttd/Makefile
+                ltt/Makefile
+                include/Makefile
+                include/ltt/Makefile
+                include/lttv/Makefile])
 AC_OUTPUT