this is not my day

Original commit message from CVS:
this is not my day

diff --git a/common b/common
index 5f51018..85747ad 160000 (submodule)
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit 5f51018de093a26d447de03e1ec6dd0377fc4c77
+Subproject commit 85747ad7d18dfc697845a457631f3877fda46906

diff --git a/configure.ac b/configure.ac
index 590b03d..19264e0 100644 (file)
--- 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)