From 25c9a7a02c03b90dd722e35d3ffa340c903bfff2 Mon Sep 17 00:00:00 2001
From: Thomas Vander Stichele <thomas@apestaart.org>
Date: Sat, 22 May 2004 14:46:19 +0000
Subject: [PATCH] this is not my day

Original commit message from CVS:
this is not my day
---
 common       | 2 +-
 configure.ac | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/common b/common
index 5f51018de0..85747ad7d1 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit 5f51018de093a26d447de03e1ec6dd0377fc4c77
+Subproject commit 85747ad7d18dfc697845a457631f3877fda46906
diff --git a/configure.ac b/configure.ac
index 590b03d4f3..19264e0659 100644
--- a/configure.ac
+++ b/configure.ac
@@ -253,7 +253,8 @@ AC_SUBST(GLIB2_REQ)
 dnl Check for glib2 with sugar on top
 PKG_CHECK_MODULES(GLIB2, glib-2.0 >= $GLIB2_REQ gobject-2.0 gthread-2.0 gmodule-2.0,HAVE_GLIB2=yes,HAVE_GLIB2=no)
 dnl for the poor souls who for example have glib in /usr/local
-AS_SCRUB_INCLUDE(GLIB2_CFLAGS)
+dnl FIXME: fix this properly first
+dnl AS_SCRUB_INCLUDE(GLIB2_CFLAGS)
 GLIB_LIBS=$GLIB2_LIBS
 GLIB_CFLAGS=$GLIB2_CFLAGS
 AC_SUBST(GLIB_LIBS)