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

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Branch:         
Changes by:     spiralvoice <address@hidden>    06/02/03 00:32:22

Modified files:
        config         : configure.in 
        distrib        : ChangeLog 

Log message:
        patch #4856

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/config/configure.in.diff?tr1=1.248&tr2=1.249&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/distrib/ChangeLog.diff?tr1=1.699&tr2=1.700&r1=text&r2=text

Patches:
Index: mldonkey/config/configure.in
diff -u mldonkey/config/configure.in:1.248 mldonkey/config/configure.in:1.249
--- mldonkey/config/configure.in:1.248  Sun Jan 29 18:42:02 2006
+++ mldonkey/config/configure.in        Fri Feb  3 00:32:22 2006
@@ -229,7 +229,7 @@
 AC_ARG_ENABLE(pthread-lib, [  --enable-pthread-lib    legacy option], 
[USE_PTHREAD="$enableval"])
 
 ICONV=yes
-AC_ARG_ENABLE(iconv,       [  --disable-iconv         disable the use of iconv 
for compiling on broken windows environments], [ICONV="$enableval"])
+AC_ARG_ENABLE(iconv,       [  --disable-iconv         disable the use of 
iconv], [ICONV="$enableval"])
 
 GD=yes
 AC_ARG_ENABLE(gd,       [  --disable-gd            disable the use of gd], 
[GD="$enableval"])
@@ -561,7 +561,7 @@
 
 AC_CHECK_HEADERS(byteswap.h,,)
 
-if test "$ICONV" = "yes"; then
+if [ [ "$ICONV" = "yes" ] && [ "$SYSTEM" != "mingw" ] ]; then
   AM_ICONV
   if test "$am_cv_func_iconv" != "yes"; then
     AC_DEFINE(DISABLE_ICONV, 1, [Define to 1 if you want to replace iconv and 
related with stubs.])
@@ -1319,12 +1319,14 @@
   echo "        disabled"
 fi
 
+if test "$SYSTEM" != "mingw"; then
 echo -n " - iconv             "
 if test "$ICONV" = "yes"; then
   echo "enabled"
 else
   echo "        disabled"
 fi
+fi
 
 echo -n " - graphical stats   "
 if test "$GD" = "yes"; then
Index: mldonkey/distrib/ChangeLog
diff -u mldonkey/distrib/ChangeLog:1.699 mldonkey/distrib/ChangeLog:1.700
--- mldonkey/distrib/ChangeLog:1.699    Fri Feb  3 00:31:40 2006
+++ mldonkey/distrib/ChangeLog  Fri Feb  3 00:32:22 2006
@@ -15,6 +15,7 @@
 =========
 
 2006/02/03
+4856: configure: disable iconv by default on MinGW
 4853: Fix HTML errors on rss command output (unease)
 
 2006/02/02