use scrub

Original commit message from CVS:
use scrub

diff --git a/common b/common
index 85747ad..6e6d3f1 160000 (submodule)
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit 85747ad7d18dfc697845a457631f3877fda46906
+Subproject commit 6e6d3f154c84195e9d505e114ea4a2df216f7277

diff --git a/configure.ac b/configure.ac
index 19264e0..590b03d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -253,8 +253,7 @@ 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
-dnl FIXME: fix this properly first
-dnl AS_SCRUB_INCLUDE(GLIB2_CFLAGS)
+AS_SCRUB_INCLUDE(GLIB2_CFLAGS)
 GLIB_LIBS=$GLIB2_LIBS
 GLIB_CFLAGS=$GLIB2_CFLAGS
 AC_SUBST(GLIB_LIBS)