Require GLib 2

1 files changed, 5 insertions, 30 deletions

diff --git a/configure b/configure
index 63047303..ac7ff3b6 100755
--- a/configure
+++ b/configure
@@ -162,38 +162,16 @@ if [ -z "$PKG_CONFIG" ]; then
 	PKG_CONFIG=pkg-config
 fi
 
-GLIB=0
-
 if $PKG_CONFIG --version > /dev/null 2>/dev/null && $PKG_CONFIG glib-2.0; then
 	cat<<EOF>>Makefile.settings
 EFLAGS+=`$PKG_CONFIG --libs glib-2.0 gmodule-2.0`
 CFLAGS+=`$PKG_CONFIG --cflags glib-2.0 gmodule-2.0`
 EOF
-	echo '#define GLIB2' >> config.h
-	GLIB=2
-elif type glib-config > /dev/null 2> /dev/null; then
-	cat<<EOF>>Makefile.settings
-EFLAGS+=`glib-config --libs`
-CFLAGS+=`glib-config --cflags`
-EOF
-	echo '#define GLIB1' >> config.h
-	GLIB=1
 else
-	echo 'Cannot find glib development libraries, aborting. (Install libglib-dev?)'
+	echo 'Cannot find glib2 development libraries, aborting. (Install libglib2-dev?)'
 	exit 1;
 fi
 
-if [ GLIB = 1 -o -r /usr/include/iconv.h ]; then
-	:;
-elif [ -r /usr/local/include/iconv.h ]; then
-	echo CFLAGS+=-I/usr/local/include >> Makefile.settings;
-else
-	echo
-	echo 'Warning: Could not find iconv.h, you might have to install it and/or modify'
-	echo 'Makefile.settings to tell where this file is.';
-fi
-
-
 detect_gnutls()
 {
 	if libgnutls-config --version > /dev/null 2> /dev/null; then
@@ -389,18 +367,15 @@ Linux )
 GNU/* )
 ;;
 *BSD )
-	echo 'EFLAGS+=-liconv' >> Makefile.settings;
-;;
-SunOS )
-	echo 'EFLAGS+=-lresolv -lnsl -lsocket' >> Makefile.settings
-	echo 'STRIP=\# skip strip' >> Makefile.settings
-	echo 'EFLAGS+=-liconv' >> Makefile.settings;
 ;;
 Darwin )
-	echo 'EFLAGS+=-liconv' >> Makefile.settings;
 ;;
 IRIX )
 ;;
+SunOS )
+	echo 'EFLAGS+=-lresolv -lnsl -lsocket' >> Makefile.settings
+	echo 'STRIP=\# skip strip' >> Makefile.settings
+;;
 CYGWIN* )
 	echo 'Cygwin is not officially supported.'
 ;;