From b00eda448b8e4cb3bff4894f7578eb06499aca49 Mon Sep 17 00:00:00 2001
From: compudj <compudj@04897980-b3bd-0310-b5e0-8ef037075253>
Date: Fri, 30 May 2003 22:09:58 +0000
Subject: [PATCH] fix to use AM_PATH_GLIB_2_0

git-svn-id: http://ltt.polymtl.ca/svn@74 04897980-b3bd-0310-b5e0-8ef037075253
---
 ltt/branches/poly/configure.in                      | 12 ++++++++----
 ltt/branches/poly/lttv/Makefile.am                  |  3 +++
 ltt/branches/poly/lttv/plugins/examples/Makefile.am |  2 ++
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/ltt/branches/poly/configure.in b/ltt/branches/poly/configure.in
index 3e911a79..c0a00e83 100644
--- 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 b9112765..7a7d4f3b 100644
--- 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 77f933df..796b6543 100644
--- 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
-- 
2.34.1