[Mldonkey-commits] mldonkey config/config.h.in config/configure.in...

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       06/08/15 11:35:13

Modified files:
        config         : config.h.in configure.in 
        distrib        : ChangeLog 
        src/utils/lib  : charsetstubs.c 

Log message:
        patch #5300

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/config/config.h.in?cvsroot=mldonkey&r1=1.25&r2=1.26
http://cvs.savannah.gnu.org/viewcvs/mldonkey/config/configure.in?cvsroot=mldonkey&r1=1.272&r2=1.273
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.958&r2=1.959
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/utils/lib/charsetstubs.c?cvsroot=mldonkey&r1=1.8&r2=1.9

Patches:
Index: config/config.h.in
===================================================================
RCS file: /sources/mldonkey/mldonkey/config/config.h.in,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- config/config.h.in  18 May 2006 17:26:18 -0000      1.25
+++ config/config.h.in  15 Aug 2006 11:35:12 -0000      1.26
@@ -21,6 +21,9 @@
 /* Define to 1 if you have the <libcharset.h> header file. */
 #undef HAVE_LIBCHARSET_H
 
+/* Define to 1 if you have the <langinfo.h> header file. */
+#undef HAVE_LANGINFO_H
+
 /* Define to 1 if you have the <linux/limits.h> header file. */
 #undef HAVE_LINUX_LIMITS_H
 

Index: config/configure.in
===================================================================
RCS file: /sources/mldonkey/mldonkey/config/configure.in,v
retrieving revision 1.272
retrieving revision 1.273
diff -u -b -r1.272 -r1.273
--- config/configure.in 27 Jun 2006 10:45:58 -0000      1.272
+++ config/configure.in 15 Aug 2006 11:35:12 -0000      1.273
@@ -825,6 +825,7 @@
   [echo "Your iconv implementation is incomplete"; exit 1]))
   AC_CHECK_LIB(charset,locale_charset)
   AC_CHECK_HEADERS([libcharset.h])
+  AC_CHECK_HEADERS([langinfo.h])
   AC_CHECK_HEADERS([locale.h])
   fi
 else

Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.958
retrieving revision 1.959
diff -u -b -r1.958 -r1.959
--- distrib/ChangeLog   15 Aug 2006 11:34:10 -0000      1.958
+++ distrib/ChangeLog   15 Aug 2006 11:35:12 -0000      1.959
@@ -15,6 +15,7 @@
 =========
 
 2006/08/15
+5300: Fix iconv compile bug on Eisfair
 5299: Support magicdb in $MLDONKEY_DIR/magic/magic if present
       this location is used in addition to the defaults of libmagic
 5277: MinGW: use new gettimeofday() from mingw-runtime-3.10 (Schlumpf)

Index: src/utils/lib/charsetstubs.c
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/utils/lib/charsetstubs.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- src/utils/lib/charsetstubs.c        24 Jul 2006 20:16:07 -0000      1.8
+++ src/utils/lib/charsetstubs.c        15 Aug 2006 11:35:12 -0000      1.9
@@ -38,7 +38,8 @@
   #endif
   #ifdef HAVE_LIBCHARSET_H
     #include <libcharset.h>
-  #else
+  #endif
+  #ifdef HAVE_LANGINFO_H
     #include <langinfo.h>
   #endif
   #include <iconv.h>