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

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Branch:         
Changes by:     spiralvoice <address@hidden>    06/02/05 13:15:56

Modified files:
        config         : configure.in 
        distrib        : ChangeLog 

Log message:
        patch #4856 reversed

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/config/configure.in.diff?tr1=1.250&tr2=1.251&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/distrib/ChangeLog.diff?tr1=1.710&tr2=1.711&r1=text&r2=text

Patches:
Index: mldonkey/config/configure.in
diff -u mldonkey/config/configure.in:1.250 mldonkey/config/configure.in:1.251
--- mldonkey/config/configure.in:1.250  Sat Feb  4 22:26:35 2006
+++ mldonkey/config/configure.in        Sun Feb  5 13:15:55 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], [ICONV="$enableval"])
+AC_ARG_ENABLE(iconv,       [  --disable-iconv         disable the use of iconv 
for compiling on broken windows environments], [ICONV="$enableval"])
 
 GD=yes
 AC_ARG_ENABLE(gd,       [  --disable-gd            disable the use of gd], 
[GD="$enableval"])
@@ -565,7 +565,7 @@
 
 AC_CHECK_HEADERS(byteswap.h,,)
 
-if [ [ "$ICONV" = "yes" ] && [ "$SYSTEM" != "mingw" ] ]; then
+if test "$ICONV" = "yes"; 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.])
@@ -1323,14 +1323,12 @@
   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.710 mldonkey/distrib/ChangeLog:1.711
--- mldonkey/distrib/ChangeLog:1.710    Sat Feb  4 22:26:36 2006
+++ mldonkey/distrib/ChangeLog  Sun Feb  5 13:15:56 2006
@@ -15,6 +15,10 @@
 =========
 
 2006/02/04
+4856: reverse patch: configure: disable iconv by default on MinGW
+      it is not necessary anymore
+
+2006/02/04
 4867: Use setrlimit to raise allowed ulimit open files
 
 2006/02/03
@@ -27,7 +31,7 @@
 4859: Multiuser: Only user "admin" is allowed to change options
       if the new option enable_user_config (default true) is set to false
 4858: HTML: Update some links to mldonkey.sf.net
-4857: SIGUSR1 & SIGUSR2 don´t exist on Windows
+4857: SIGUSR1 & SIGUSR2 do not exist on Windows
 4856: configure: disable iconv by default on MinGW
 4853: Fix HTML errors on rss command output (unease)