diff options
| author | Frédéric Péters <fpeters@entrouvert.com> | 2012-04-02 23:47:40 +0200 |
|---|---|---|
| committer | Frédéric Péters <fpeters@entrouvert.com> | 2012-04-02 23:47:40 +0200 |
| commit | 952c0f552cddeeaa7d9b9c2914a2c651baceb58c (patch) | |
| tree | 35c36352236d68020cbdc2224be2194224112274 | |
| parent | 33bff4308fff6cd4e4283afb6486db4943c0344b (diff) | |
| download | lasso-952c0f552cddeeaa7d9b9c2914a2c651baceb58c.tar.gz lasso-952c0f552cddeeaa7d9b9c2914a2c651baceb58c.tar.xz lasso-952c0f552cddeeaa7d9b9c2914a2c651baceb58c.zip | |
build: do not include multiple glib headers
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | lasso/errors.c | 2 | ||||
| -rw-r--r-- | lasso/errors.c.in | 2 | ||||
| -rw-r--r-- | lasso/xml/xml.h | 1 |
4 files changed, 3 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 7770127f..04dbe3ae 100644 --- a/configure.ac +++ b/configure.ac @@ -706,7 +706,7 @@ if test "z$PKG_CONFIG_PATH" != "z"; then export PKG_CONFIG_PATH fi -PKG_CHECK_MODULES(LASSO, glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0 libxml-2.0 xmlsec1 >= 1.2.6 xmlsec1-openssl >= 1.2.6 openssl) +PKG_CHECK_MODULES(LASSO, glib-2.0 >= 2.17.0 gobject-2.0 >= 2.17.0 libxml-2.0 xmlsec1 >= 1.2.6 xmlsec1-openssl >= 1.2.6 openssl) AC_ARG_WITH(sasl2, [ --with-sasl2[=PFX] Use Cyrus SASL library version 2 for WSF-Auth]) if test "x$enable_wsf" = "xyes"; then diff --git a/lasso/errors.c b/lasso/errors.c index 2a38f3dd..b35b546d 100644 --- a/lasso/errors.c +++ b/lasso/errors.c @@ -22,7 +22,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include <glib/gstrfuncs.h> +#include <glib.h> #include "errors.h" #include "xml/xml.h" diff --git a/lasso/errors.c.in b/lasso/errors.c.in index 25c09f6c..1787ee90 100644 --- a/lasso/errors.c.in +++ b/lasso/errors.c.in @@ -22,7 +22,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include <glib/gstrfuncs.h> +#include <glib.h> #include "errors.h" #include "xml/xml.h" diff --git a/lasso/xml/xml.h b/lasso/xml/xml.h index a0630aab..5407ed5a 100644 --- a/lasso/xml/xml.h +++ b/lasso/xml/xml.h @@ -33,7 +33,6 @@ extern "C" { #include <glib.h> #include <glib-object.h> -#include <glib/gprintf.h> #include <libxml/uri.h> #include <libxml/tree.h> |