diff options
| author | olavmrk <olavmrk@a716ebb1-153a-0410-b759-cfb97c6a1b53> | 2013-03-15 08:20:19 +0000 |
|---|---|---|
| committer | olavmrk <olavmrk@a716ebb1-153a-0410-b759-cfb97c6a1b53> | 2013-03-15 08:20:19 +0000 |
| commit | ba7530132dc055920a4e86eced235031d12df38c (patch) | |
| tree | 7e6a8ec61ac64ae880e497c897b8ba25f871c688 | |
| parent | ef8bfd589694080908272a8e9ead05ba607f5679 (diff) | |
| download | mod_auth_mellon-ba7530132dc055920a4e86eced235031d12df38c.tar.gz mod_auth_mellon-ba7530132dc055920a4e86eced235031d12df38c.tar.xz mod_auth_mellon-ba7530132dc055920a4e86eced235031d12df38c.zip | |
Directly link to GLib.
Instead of relying on the Lasso library including GLib for us,
we should link directly with it.
git-svn-id: https://modmellon.googlecode.com/svn/trunk@194 a716ebb1-153a-0410-b759-cfb97c6a1b53
| -rw-r--r-- | Makefile.in | 2 | ||||
| -rw-r--r-- | configure.ac | 2 |
2 files changed, 3 insertions, 1 deletions
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 |