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

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       06/08/21 20:26:13

Modified files:
        config         : configure.in 
        distrib        : ChangeLog 

Log message:
        patch #5319

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/config/configure.in?cvsroot=mldonkey&r1=1.275&r2=1.276
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.970&r2=1.971

Patches:
Index: config/configure.in
===================================================================
RCS file: /sources/mldonkey/mldonkey/config/configure.in,v
retrieving revision 1.275
retrieving revision 1.276
diff -u -b -r1.275 -r1.276
--- config/configure.in 21 Aug 2006 10:46:34 -0000      1.275
+++ config/configure.in 21 Aug 2006 20:26:12 -0000      1.276
@@ -226,8 +226,13 @@
 FASTTRACK=yes
 FILETP=yes
 MULTINET=yes
+MINIMUM=no
+GD=yes
+BZIP2=yes
+MAGIC=yes
 AC_ARG_ENABLE(multinet,      [  --disable-multinet      allows you to only 
compile support for edonkey + Overnet], [MULTINET="$enableval"])
-if test ! "$MULTINET" = "yes"; then
+AC_ARG_ENABLE(minimum,       [  --disable-minimum       compile MLDonkey with 
minimum features], [MINIMUM="$enableval"])
+if [ test ! "$MULTINET" = "yes" ] || [ test "$MINIMUM" = "yes" ]; then
   OPEN_NAPSTER=no
   GNUTELLA=no
   GNUTELLA2=no
@@ -237,7 +242,12 @@
   FASTTRACK=no
   FILETP=no
   BITTORRENT=no
-  RELEASENAME="$RELEASENAME-nomultinet"
+fi
+if [ test "$MINIMUM" = "yes" ]; then
+  DONKEY_SUI=no
+  GD=no
+  BZIP2=no
+  MAGIC=no
 fi
 AC_ARG_ENABLE(donkey,        [  --disable-donkey        allows you to remove 
support for eDonkey], [DONKEY="$enableval"])
 AC_ARG_ENABLE(donkeysui,     [  --disable-donkeysui     allows you to remove 
support for eMule SecureUserIdent], [DONKEY_SUI="$enableval"])
@@ -297,13 +307,10 @@
 ICONV=yes
 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"])
 
-BZIP2=yes
 AC_ARG_ENABLE(bzip2,       [  --disable-bzip2         disable the use of 
bzip2], [BZIP2="$enableval"])
 
-MAGIC=yes
 AC_ARG_ENABLE(magic,       [  --disable-magic         disable the use of 
libmagic (GNU file)], [MAGIC="$enableval"])
 
 if test "$FORCE_MINGW" = "yes"; then
@@ -1276,7 +1283,6 @@
 AC_SUBST(ARCH)
 AC_SUBST(COMPRESS)
 AC_SUBST(COMPRESS_EXT)
-AC_SUBST(RELEASENAME)
 AC_SUBST(CHECKBOUNDS)
 AC_SUBST(MLDONKEY_VERSION)
 AC_SUBST(SCM_VERSION)

Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.970
retrieving revision 1.971
diff -u -b -r1.970 -r1.971
--- distrib/ChangeLog   21 Aug 2006 18:31:55 -0000      1.970
+++ distrib/ChangeLog   21 Aug 2006 20:26:13 -0000      1.971
@@ -15,6 +15,8 @@
 =========
 
 2006/08/21
+5319: Configure: New option --enable-minimum
+- Compile MLDonkey with Donkey only, without gd, magic, bzip2, sui
 5304: cleanup donkeyOptions.ml (whitespace, tabs, comments) (Schlumpf)
 5303: cleanup btOptions.ml (whitespace, tabs, comments) (Schlumpf)
 5302: cleanup commonOptions.ml (whitespace, tabs, comments) (Schlumpf)