Changeset 4ff0966 for configure

Timestamp:

2006-05-28T23:13:47Z (18 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

df417ca

Parents:

cdca30b (diff), 79b6213 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merging from main/jelmer.

File:

• configure (modified) (4 diffs)

configure

@@ -169 +169 @@
 fi
 
-GLIB=0
-
 if $PKG_CONFIG --version > /dev/null 2>/dev/null && $PKG_CONFIG glib-2.0; then
         cat<<EOF>>Makefile.settings
@@ -176 +174 @@
 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?)'
+else
+        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
-
 
 if [ "$events" = "libevent" ]; then
@@ -223 +201 @@
 fi
 echo 'EVENT_HANDLER=events_'$events'.o' >> Makefile.settings
-
 
 detect_gnutls()
@@ -420 +397 @@
 ;;
 *BSD )
-        echo 'EFLAGS+=-liconv' >> Makefile.settings;
+;;
+Darwin )
+;;
+IRIX )
 ;;
 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 )
 ;;
 CYGWIN* )