[Mldonkey-commits] mldonkey config/configure.in distrib/ChangeLog

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       13/07/20 10:14:58

Modified files:
        config         : configure.in 
        distrib        : ChangeLog 

Log message:
        patch #8123

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/config/configure.in?cvsroot=mldonkey&r1=1.357&r2=1.358
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1580&r2=1.1581

Patches:
Index: config/configure.in
===================================================================
RCS file: /sources/mldonkey/mldonkey/config/configure.in,v
retrieving revision 1.357
retrieving revision 1.358
diff -u -b -r1.357 -r1.358
--- config/configure.in 7 Jul 2013 11:46:34 -0000       1.357
+++ config/configure.in 20 Jul 2013 10:14:57 -0000      1.358
@@ -932,13 +932,30 @@
     GDMAJORVERSION=`$GDLIBCONFIG --majorversion`
     GDMINORVERSION=`$GDLIBCONFIG --minorversion`
     GDREVISION=`$GDLIBCONFIG --revision`
-    if [ [ $GDMAJORVERSION = 2 ] && [ $GDMINORVERSION = 0 ] && [ $GDREVISION 
-gt 14 ]]; then
+    case $GDMAJORVERSION in
+        1)
+            AC_MSG_RESULT(no (found $GDVERSION))
+            LIBGD=no
+            ;;
+        2)
+            if test $GDMINORVERSION -ge 1; then
+                AC_MSG_RESULT($GDVERSION)
+                LIBGD=yes
+            else
+                if test $GDREVISION -gt 14; then
        AC_MSG_RESULT($GDVERSION)
        LIBGD=yes
     else
        AC_MSG_RESULT(no (found $GDVERSION))
        LIBGD=no
     fi
+            fi
+            ;;
+        *)
+            AC_MSG_RESULT($GDVERSION)
+            LIBGD=yes
+            ;;
+    esac
   else
     LIBGD=yes
   fi

Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1580
retrieving revision 1.1581
diff -u -b -r1.1580 -r1.1581
--- distrib/ChangeLog   7 Jul 2013 11:49:37 -0000       1.1580
+++ distrib/ChangeLog   20 Jul 2013 10:14:57 -0000      1.1581
@@ -14,6 +14,9 @@
 ChangeLog
 =========
 
+2013/07/20:
+8123: configure: Fix GD version check for GD 2.1.x
+
 2013/07/07:
 8115: Use magnet: links without dllink
 8114: Fix --enable-force-ocaml with Ocaml 4.00.x