--- aclocal.m4.orig	2006-08-10 13:14:12.000000000 +0100
+++ aclocal.m4	2006-08-10 13:36:23.000000000 +0100
@@ -377,8 +377,8 @@
 # RSCT
 if test "$build_rsct" = "no"; then
 	AC_MSG_NOTICE([     not building rsct ... disabled by user])
-elif test "$have_glib" = "no"; then
-	AC_MSG_NOTICE([     not building rsct ... requires glib library])
+elif test "$have_glib2" = "no"; then
+	AC_MSG_NOTICE([     not building rsct ... requires glib2 library])
 elif test "$have_ha_gs_r" = "no"; then
 	AC_MSG_NOTICE([     not building rsct ... requires ha_gs_r library])
 elif test "$have_ha_gs_h" = "no"; then
@@ -479,8 +479,8 @@
 # GUI
 if test "$build_gui" = "no"; then
 	AC_MSG_NOTICE([     not building gui ... disabled by user])
-elif test "$have_glib" = "no"; then
-	AC_MSG_NOTICE([     not building gui ... requires glib library])
+elif test "$have_glib2" = "no"; then
+	AC_MSG_NOTICE([     not building gui ... requires glib2 library])
 elif test "$have_gtk" = "no"; then
 	AC_MSG_NOTICE([     not building gui ... requires gtk library])
 else
@@ -1286,10 +1286,10 @@
 		   [ifelse([$3], , :, [$3])])
 fi
 
-ha_glib=glib
-have_ha_glib=$have_glib
-HA_GLIB_CPPFLAGS=$GLIB_CPPFLAGS
-HA_GLIB_LIBS=$GLIB_LIBS
+ha_glib=glib2
+have_ha_glib=$have_glib2
+HA_GLIB_CPPFLAGS=$GLIB2_CPPFLAGS
+HA_GLIB_LIBS=$GLIB2_LIBS
 
 if test "$have_ha_version" = "yes"; then
 	if test -d /usr/include/heartbeat -a	\