Changeset 68b518d6 for configure

Timestamp:

2006-05-26T09:03:38Z (19 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

cdca30b

Parents:

41ca004 (diff), c53911e (diff), 7bfd574 (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 development tree.

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
@@ -175 +177 @@
 EOF
         echo '#define GLIB2' >> config.h
+        GLIB=2
 elif type glib-config > /dev/null 2> /dev/null; then
         cat<<EOF>>Makefile.settings
@@ -181 +184 @@
 EOF
         echo '#define GLIB1' >> config.h
+        GLIB=1
 else
         echo 'Cannot find glib development libraries, aborting. (Install libglib-dev?)'
@@ -186 +190 @@
 fi
 
-if [ -r /usr/include/iconv.h ]; then
+if [ GLIB = 1 -o -r /usr/include/iconv.h ]; then
         :;
 elif [ -r /usr/local/include/iconv.h ]; then