Changes in configure [36e9f62:670204f]

File:

• configure (modified) (4 diffs)

configure

@@ -31 +31 @@
 
 events=glib
-ldap=auto
+ldap=0
 ssl=auto
 
 arch=`uname -s`
 cpu=`uname -m`
+
+GLIB_MIN_VERSION=2.4
 
 echo BitlBee configure
@@ -175 +177 @@
 
 if $PKG_CONFIG --version > /dev/null 2>/dev/null && $PKG_CONFIG glib-2.0; then
-        cat<<EOF>>Makefile.settings
+        if $PKG_CONFIG glib-2.0 --atleast-version=$GLIB_MIN_VERSION; 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
-else
+        else
+                echo
+                echo 'Found glib2 '`$PKG_CONFIG glib-2.0 --modversion`', but version '$GLIB_MIN_VERSION' or newer is required.'
+                exit 1
+        fi
+else
+        echo
         echo 'Cannot find glib2 development libraries, aborting. (Install libglib2-dev?)'
-        exit 1;
+        exit 1
 fi
 
@@ -290 +299 @@
 elif [ "$ssl" = "bogus" ]; then
         echo
-        echo 'Using bogus SSL code. This means some features have to be disabled.'
+        echo 'Using bogus SSL code. This means some features will not work properly.'
         
         ## Yes, you, at the console! How can you authenticate if you don't have any SSL!?
@@ -318 +327 @@
 
 echo 'SSL_CLIENT=ssl_'$ssl'.o' >> Makefile.settings
-
-for i in /lib /usr/lib /usr/local/lib; do
-        if [ -e $i/libresolv.a ]; then
-                echo '#define HAVE_RESOLV_A' >> config.h
-                echo 'EFLAGS+='$i'/libresolv.a' >> Makefile.settings
-                break
-        fi
-done
 
 STORAGES="text xml"