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

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Branch:         
Changes by:     spiralvoice <address@hidden>    06/05/19 19:04:15

Modified files:
        config         : configure.in 
        distrib        : ChangeLog 

Log message:
        patch #5107

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/config/configure.in.diff?tr1=1.265&tr2=1.266&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/distrib/ChangeLog.diff?tr1=1.835&tr2=1.836&r1=text&r2=text

Patches:
Index: mldonkey/config/configure.in
diff -u mldonkey/config/configure.in:1.265 mldonkey/config/configure.in:1.266
--- mldonkey/config/configure.in:1.265  Thu May 18 17:26:18 2006
+++ mldonkey/config/configure.in        Fri May 19 19:04:15 2006
@@ -651,7 +651,11 @@
 
 if test "$MAGIC" != "no"; then
   echo "----- checking libmagic (GNU file) (optional)"
-  
AC_CHECK_HEADERS(magic.h,[AC_CHECK_LIB(magic,magic_file,[MAGIC=yes],[MAGIC=no])],[MAGIC=no])
+  AC_CHECK_HEADERS(magic.h,
+    [AC_CHECK_LIB(magic,magic_file,
+      [AC_CHECK_DECL([MAGIC_ERROR], [MAGIC=yes], [MAGIC=no],[#include 
<magic.h>])],
+      [MAGIC=no])],
+    [MAGIC=no])
 fi
 
 if test "$MAGIC" = "yes"; then
Index: mldonkey/distrib/ChangeLog
diff -u mldonkey/distrib/ChangeLog:1.835 mldonkey/distrib/ChangeLog:1.836
--- mldonkey/distrib/ChangeLog:1.835    Fri May 19 14:52:11 2006
+++ mldonkey/distrib/ChangeLog  Fri May 19 19:04:15 2006
@@ -15,6 +15,7 @@
 =========
 
 2006/05/19
+5107: Configure: Check for MAGIC_ERROR in magic.h
 5106: BT: only send stop once on exit and then wait for success (Amorphous)
 5105: BT: Avoid starting torrent which has the same name
       as a currently downloading torrent