Index: ctrlproxy-3.0.8/Makefile.settings.in
===================================================================
--- ctrlproxy-3.0.8.orig/Makefile.settings.in
+++ ctrlproxy-3.0.8/Makefile.settings.in
@@ -1,6 +1,6 @@
 BZR_CHECKOUT = @BZR_CHECKOUT@
 SHLIBEXT = so
-LIBS = @LIBS@ @COMMON_LIBS@ 
+LIBS = @LIBS@ @GLIB_LIBS@
 CC = @CC@
 LD = @CC@
 prefix = @prefix@
@@ -21,7 +21,7 @@ sysconfdir = @sysconfdir@
 localstatedir = @localstatedir@
 EXEEXT = @EXEEXT@
 OBJEXT = @OBJEXT@
-CFLAGS = @CFLAGS@ @COMMON_CFLAGS@
+CFLAGS = @CFLAGS@ @GLIB_CFLAGS@
 LDFLAGS = @LDFLAGS@
 BINS = @BINS@
 scriptdir = $(cdatadir)/scripts
Index: ctrlproxy-3.0.8/configure.ac
===================================================================
--- ctrlproxy-3.0.8.orig/configure.ac
+++ ctrlproxy-3.0.8/configure.ac
@@ -62,7 +62,9 @@ AC_TYPE_SIGNAL
 AC_CHECK_FUNCS([gethostbyname gethostname memset strchr strerror strstr uname backtrace_symbols gettimeofday strrchr daemon])
 
 PKG_PROG_PKG_CONFIG
-PKG_CHECK_MODULES(COMMON, glib-2.0 >= 2.6.0 gmodule-2.0)
+PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.6.0 gmodule-2.0 >= 2.6.0)
+AC_SUBST(GLIB_CFLAGS)
+AC_SUBST(GLIB_LIBS)
 PKG_CHECK_MODULES(CHECK, check, [], [ echo -n "" ])
 
 ###############################################################################
Index: ctrlproxy-3.0.8/Makefile
===================================================================
--- ctrlproxy-3.0.8.orig/Makefile
+++ ctrlproxy-3.0.8/Makefile
@@ -102,11 +102,11 @@ headers = src/admin.h \
 dep_files = $(patsubst %.o, %.d, $(objs))
 
 linestack-cmd$(EXEEXT): src/linestack-cmd.o $(objs) $(LIBIRC)
-	@echo Linking $@
-	@$(LD) $(LIBS) -lreadline -rdynamic -o $@ $^
+	@echo Linking $@: $(LD) $(LDFLAGS) -rdynamic -o $@ $^ $(LIBS)
+	@$(LD) $(LDFLAGS) -rdynamic -o $@ $^ $(LIBS)
 
 ctrlproxy$(EXEEXT): src/main.o $(objs) $(LIBIRC)
-	@echo Linking $@
+	@echo Linking $@: $(LD) $(LDFLAGS) -rdynamic -o $@ $^ $(LIBS)
 	@$(LD) $(LDFLAGS) -rdynamic -o $@ $^ $(LIBS)
 
 src/settings.o: CFLAGS+=-DSYSCONFDIR=\"${sysconfdir}\"