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

[mldonkey-commits]

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

Modified files:
        config         : Makefile.in configure.in 
        distrib        : ChangeLog 
Added files:
        src/utils/cdk  : tar.mlcpp tar.mli 
        src/utils/lib  : misc2.mlcpp 
Removed files:
        src/utils/cdk  : tar_bz2.ml tar_bz2.mli tar_no_bz2.ml 
                         tar_no_bz2.mli 
        src/utils/lib  : misc2_bz2.ml misc2_no_bz2.ml 

Log message:
        patch #4875

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/config/Makefile.in.diff?tr1=1.145&tr2=1.146&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/config/configure.in.diff?tr1=1.252&tr2=1.253&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/distrib/ChangeLog.diff?tr1=1.717&tr2=1.718&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/utils/cdk/tar.mlcpp?rev=1.1
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/utils/cdk/tar.mli.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/utils/lib/misc2.mlcpp?rev=1.1

Patches:
Index: mldonkey/config/Makefile.in
diff -u mldonkey/config/Makefile.in:1.145 mldonkey/config/Makefile.in:1.146
--- mldonkey/config/Makefile.in:1.145   Sun Feb  5 13:20:30 2006
+++ mldonkey/config/Makefile.in Sun Feb  5 13:45:05 2006
@@ -145,7 +145,7 @@
   CDK_SRCS +=  $(CDK)/bzlib.ml $(CDK)/bzip2.ml
 endif
 
-CDK_SRCS +=  $(CDK)/zlib.ml $(CDK)/zip.ml $(CDK)/gzip.ml $(CDK)/zlibstubs.c 
$(CDK)/tar.ml
+CDK_SRCS +=  $(CDK)/zlib.ml $(CDK)/zip.ml $(CDK)/gzip.ml $(CDK)/zlibstubs.c 
$(CDK)/tar.mlcpp
 
 CDK_SRCS += $(LIB)/autoconf.ml
 
@@ -183,7 +183,7 @@
   $(LIB)/intset.ml \
   $(LIB)/hole_tab.ml $(LIB)/store.ml \
   $(LIB)/indexer.ml $(LIB)/indexer1.ml $(LIB)/indexer2.ml $(LIB)/host.ml  \
-  $(LIB)/misc2.ml $(LIB)/misc.ml $(LIB)/unix32.ml  $(LIB)/md4.ml \
+  $(LIB)/misc2.mlcpp $(LIB)/misc.ml $(LIB)/unix32.ml  $(LIB)/md4.ml \
   $(LIB)/avifile.ml $(LIB)/http_lexer.mll $(LIB)/url.ml \
   $(RSS)/rss_date.ml \
   $(LIB)/date.ml  $(LIB)/fst_hash.c \
@@ -1700,7 +1700,6 @@
        rm -f src/utils/lib/gAutoconf.ml.new
        rm -f src/utils/lib/misc2.ml
        rm -f src/utils/cdk/tar.ml
-       rm -f src/utils/cdk/tar.mli
        rm -f icons/tux/*.ml_icons
        rm -f icons/tux/*.ml
        rm -f icons/kde/*.ml_icons
Index: mldonkey/config/configure.in
diff -u mldonkey/config/configure.in:1.252 mldonkey/config/configure.in:1.253
--- mldonkey/config/configure.in:1.252  Sun Feb  5 13:20:30 2006
+++ mldonkey/config/configure.in        Sun Feb  5 13:45:05 2006
@@ -550,15 +550,8 @@
 fi
 
 if test "$BZIP2" = "yes"; then
-  cp -f ../src/utils/lib/misc2_bz2.ml ../src/utils/lib/misc2.ml
-  cp -f ../src/utils/cdk/tar_bz2.ml ../src/utils/cdk/tar.ml
-  cp -f ../src/utils/cdk/tar_bz2.mli ../src/utils/cdk/tar.mli
   AC_CHECK_LIB(bz2,BZ2_bzlibVersion,[AC_DEFINE(HAVE_BZLIBVERSION, 1,)])
   AC_DEFINE(USE_BZIP2, 1, [Define to 1 if you have bzip2 support.])
-else
-  cp -f ../src/utils/lib/misc2_no_bz2.ml ../src/utils/lib/misc2.ml
-  cp -f ../src/utils/cdk/tar_no_bz2.ml ../src/utils/cdk/tar.ml
-  cp -f ../src/utils/cdk/tar_no_bz2.mli ../src/utils/cdk/tar.mli
 fi
 
 AC_CHECK_HEADERS(byteswap.h,,)
Index: mldonkey/distrib/ChangeLog
diff -u mldonkey/distrib/ChangeLog:1.717 mldonkey/distrib/ChangeLog:1.718
--- mldonkey/distrib/ChangeLog:1.717    Sun Feb  5 13:25:22 2006
+++ mldonkey/distrib/ChangeLog  Sun Feb  5 13:45:05 2006
@@ -15,6 +15,7 @@
 =========
 
 2006/02/05
+4875: conditional bzip2 support using cpp (pango)
 4870: runinfo: add connected_user and check empty PW (schlumpf)
 4872: Fix gd detection on NetBSD, use data from gdlib-config
       MinGW compile-guide was updated, gdlib-config has to be changed