From f1455f5b8a1117efcb77ab4f523ea5e0918f2dad Mon Sep 17 00:00:00 2001
From: olavmrk <olavmrk@a716ebb1-153a-0410-b759-cfb97c6a1b53>
Date: Fri, 15 Mar 2013 08:50:23 +0000
Subject: Revert "Revert "Directly link to GLib.""

I accidentally committed a revert that I had done for debugging.

This commit reverts the revert :)

git-svn-id: https://modmellon.googlecode.com/svn/trunk@197 a716ebb1-153a-0410-b759-cfb97c6a1b53
---
 Makefile.in  | 2 +-
 configure.ac | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Makefile.in b/Makefile.in
index 68b76a8..fff8a9a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -22,7 +22,7 @@ DISTFILES=$(SRC) \
 all:	mod_auth_mellon.la
 
 mod_auth_mellon.la: $(SRC) auth_mellon.h
-	@APXS2@ -Wc,"@OPENSSL_CFLAGS@ @LASSO_CFLAGS@ @CURL_CFLAGS@" -Wl,"@OPENSSL_LIBS@ @LASSO_LIBS@ @CURL_LIBS@" -Wc,-Wall -Wc,-g -c $(SRC)
+	@APXS2@ -Wc,"@OPENSSL_CFLAGS@ @LASSO_CFLAGS@ @CURL_CFLAGS@ @GLIB_CFLAGS@" -Wl,"@OPENSSL_LIBS@ @LASSO_LIBS@ @CURL_LIBS@ @GLIB_LIBS@" -Wc,-Wall -Wc,-g -c $(SRC)
 
 
 # Building configure (for distribution)
diff --git a/configure.ac b/configure.ac
index 7725460..d062362 100644
--- a/configure.ac
+++ b/configure.ac
@@ -66,6 +66,8 @@ AC_SUBST(OPENSSL_LIBS)
 
 # We need at least version 2.12 of GLib.
 PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.12])
+AC_SUBST(GLIB_CFLAGS)
+AC_SUBST(GLIB_LIBS)
 
 
 # Create Makefile from Makefile.in
-- 
cgit