fix to use AM_PATH_GLIB_2_0

git-svn-id: http://ltt.polymtl.ca/svn@74 04897980-b3bd-0310-b5e0-8ef037075253

diff --git a/ltt/branches/poly/configure.in b/ltt/branches/poly/configure.in
index 3e911a7927ab646cffb44db609ae5bde32d5fd23..c0a00e8384d3a4e83f73c45114176fb180540170 100644 (file)
--- a/ltt/branches/poly/configure.in
+++ b/ltt/branches/poly/configure.in
@@ -6,16 +6,17 @@ AC_INIT(FULL-PACKAGE-NAME, VERSION, BUG-REPORT-ADDRESS)
 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)
 
 # 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
@@ -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)
 

diff --git a/ltt/branches/poly/lttv/Makefile.am b/ltt/branches/poly/lttv/Makefile.am
index b911276554c9467be318052654238730c6585f36..7a7d4f3b03d13d5622b171741cb963eb3175149a 100644 (file)
--- a/ltt/branches/poly/lttv/Makefile.am
+++ b/ltt/branches/poly/lttv/Makefile.am
@@ -1,5 +1,8 @@
 SUBDIRS = modules plugins
 
+AM_CFLAGS = $(GLIB_CFLAGS) 
+LIBS += $(GLIB_LIBS)
+
 bin_PROGRAMS = textui
 
 #AM_CPPFLAGS = \

diff --git a/ltt/branches/poly/lttv/plugins/examples/Makefile.am b/ltt/branches/poly/lttv/plugins/examples/Makefile.am
index 77f933df465827c4ed35d1d000f926ba18c50c5e..796b6543c67ef97b0d21407dbb7f540f8e11b101 100644 (file)
--- a/ltt/branches/poly/lttv/plugins/examples/Makefile.am
+++ b/ltt/branches/poly/lttv/plugins/examples/Makefile.am
@@ -5,6 +5,8 @@
 #
 
 libdir = ${lttvplugindir}
+AM_CFLAGS = $(GLIB_CFLAGS) 
+LIBS += $(GLIB_LIBS)
 
 lib_LTLIBRARIES = sampledep.la samplemodule.la samplemodule2.la
 sampledep_la_LDFLAGS = -module