build: do not include multiple glib headers

This commit is contained in:
Frédéric Péters 2012-04-02 23:47:40 +02:00
parent 33bff4308f
commit 952c0f552c
4 changed files with 3 additions and 4 deletions

View File

@ -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

View File

@ -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"

View File

@ -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"

View File

@ -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>