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

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Branch:         
Changes by:     spiralvoice <address@hidden>    06/02/13 20:38:40

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

Log message:
        patch #4908

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/config/configure.in.diff?tr1=1.256&tr2=1.257&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/distrib/ChangeLog.diff?tr1=1.733&tr2=1.734&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/utils/lib/stubs_c.c.diff?tr1=1.34&tr2=1.35&r1=text&r2=text

Patches:
Index: mldonkey/config/configure.in
diff -u mldonkey/config/configure.in:1.256 mldonkey/config/configure.in:1.257
--- mldonkey/config/configure.in:1.256  Sat Feb 11 19:52:57 2006
+++ mldonkey/config/configure.in        Mon Feb 13 20:38:39 2006
@@ -1,6 +1,6 @@
 
 AC_REVISION(norev)
-AC_PREREQ(2.55)
+AC_PREREQ(2.53)
 AC_INIT(Makefile.config.in)
 AC_CONFIG_HEADER(config.h)
 
@@ -35,7 +35,7 @@
     SYSTEM=cygwin
     OS_FILES2=cygwin
     ;;
-  *freebsd*)
+  *freebsd*|*dragonfly*)
     SYSTEM=freebsd
     CPPFLAGS="${CPPFLAGS} -I/usr/local/include"
     LDFLAGS="${LDFLAGS} -L/usr/local/lib"
@@ -84,12 +84,14 @@
       fi
     fi
     if test "xFIX_BROKEN_CPP" = "x"; then
-      AC_MSG_FAILURE([Apple cpp produces broken files, your system lacks sed 
or grep to fix it])
+      echo "Apple cpp produces broken files, your system lacks sed or grep to 
fix it"
+      exit 1
     fi
     ;;
 esac
 if test "x$SYSTEM" = "xunknown"; then
-  AC_MSG_FAILURE([Unknown build system, please notify MLdonkey developer team])
+  echo "Unknown build system, please notify MLdonkey developer team"
+  exit 1
 fi
 
 if test -d .svn; then
@@ -577,8 +579,8 @@
 #endif
 ])
 
-AC_CHECK_LIB(z,inflate,,[AC_MSG_FAILURE([Zlib missing, did you install zlib 
and zlib-developer packages?])])
-AC_CHECK_HEADERS(zlib.h,,[AC_MSG_FAILURE([Zlib missing, did you install zlib 
and zlib-developer packages?])])
+AC_CHECK_LIB(z,inflate,,[echo "Zlib missing, did you install zlib and 
zlib-developer packages?"; exit 1])
+AC_CHECK_HEADERS(zlib.h,,[echo "Zlib missing, did you install zlib and 
zlib-developer packages?"; exit 1])
 AC_CHECK_LIB(z,zlibVersion,[AC_DEFINE(HAVE_ZLIBVERSION, 1,)])
 
 if test "$BZIP2" != "no"; then
@@ -603,7 +605,7 @@
   AC_TRY_LINK([#include <langinfo.h>],
   [char* cs = nl_langinfo(CODESET);],
   AC_MSG_NOTICE(found nl_langinfo(CODESET)),
-  [AC_MSG_FAILURE(Your iconv implementation is incomplete)]))
+  [echo "Your iconv implementation is incomplete"; exit 1]))
   AC_CHECK_LIB(charset,locale_charset)
   AC_CHECK_HEADERS([libcharset.h])
   AC_CHECK_HEADERS([locale.h])
Index: mldonkey/distrib/ChangeLog
diff -u mldonkey/distrib/ChangeLog:1.733 mldonkey/distrib/ChangeLog:1.734
--- mldonkey/distrib/ChangeLog:1.733    Sat Feb 11 19:52:57 2006
+++ mldonkey/distrib/ChangeLog  Mon Feb 13 20:38:39 2006
@@ -14,6 +14,9 @@
 ChangeLog
 =========
 
+2006/02/13
+4908: Configure: Fix for Beos, allow use of Dragonfly BSD
+
 2006/02/11
 4883: Mac OS X: Fix for broken Apple cpp-3.3
 4902: EDK: Stub respond to directory browsing requests (sam_dennis)
Index: mldonkey/src/utils/lib/stubs_c.c
diff -u mldonkey/src/utils/lib/stubs_c.c:1.34 
mldonkey/src/utils/lib/stubs_c.c:1.35
--- mldonkey/src/utils/lib/stubs_c.c:1.34       Sat Feb  4 22:26:36 2006
+++ mldonkey/src/utils/lib/stubs_c.c    Mon Feb 13 20:38:40 2006
@@ -1104,8 +1104,8 @@
   v = copy_string (buf->f_basetype); caml_modify (&Field (bufv, 9), v);
   v = copy_int64 (buf->f_frsize); caml_modify (&Field (bufv, 10), v);
 #else
-#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || 
defined(__APPLE__)
-#  if defined(__OpenBSD__) || defined(__NetBSD__) || (defined(__FreeBSD__) && 
__FreeBSD_version < 502000)
+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || 
defined(__APPLE__) || defined(__DragonFly__)
+#  if defined(__OpenBSD__) || defined(__NetBSD__) || (defined(__FreeBSD__) && 
__FreeBSD_version < 502000) || defined(__DragonFly__)
 #    include <sys/syslimits.h>
      v = copy_int64 (NAME_MAX); caml_modify (&Field (bufv, 8), v);
 #  else