[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Mldonkey-commits] mldonkey config/configure.in distrib/ChangeLog
From: |
mldonkey-commits |
Subject: |
[Mldonkey-commits] mldonkey config/configure.in distrib/ChangeLog |
Date: |
Sun, 24 Jun 2012 07:58:10 +0000 |
CVSROOT: /sources/mldonkey
Module name: mldonkey
Changes by: spiralvoice <spiralvoice> 12/06/24 07:58:09
Modified files:
config : configure.in
distrib : ChangeLog
Log message:
patch #7796
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/config/configure.in?cvsroot=mldonkey&r1=1.351&r2=1.352
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1550&r2=1.1551
Patches:
Index: config/configure.in
===================================================================
RCS file: /sources/mldonkey/mldonkey/config/configure.in,v
retrieving revision 1.351
retrieving revision 1.352
diff -u -b -r1.351 -r1.352
--- config/configure.in 13 May 2012 19:46:41 -0000 1.351
+++ config/configure.in 24 Jun 2012 07:58:09 -0000 1.352
@@ -485,7 +485,8 @@
OCAML_PATH=
-echo -e "\n--------------------------------"
+echo ""
+echo "--------------------------------"
echo " Checking system tools."
echo "--------------------------------"
@@ -529,8 +530,8 @@
echo "----------------------------------------"
echo " Checking system tools finished."
-echo -e "----------------------------------------\n"
-
+echo "----------------------------------------"
+echo ""
echo "--------------------------------"
echo " Checking Ocaml compiler."
echo "--------------------------------"
@@ -772,7 +773,8 @@
OCAMLOPT="$OCAMLOPT -g"
fi
-echo -e "\n----------------------------------"
+echo ""
+echo "----------------------------------"
echo " Checking system headers."
echo "----------------------------------"
@@ -826,7 +828,8 @@
])
echo "-------------------------------------------"
echo " Checking system headers finished."
-echo -e "-------------------------------------------\n"
+echo "-------------------------------------------"
+echo ""
echo "-----------------------------------"
echo " Checking system libraries."
echo "-----------------------------------"
@@ -1133,7 +1136,8 @@
echo "---------------------------------------------"
echo " Checking system libraries finished."
-echo -e "---------------------------------------------\n"
+echo "---------------------------------------------"
+echo ""
CXX_VERSION=
CRYPTOPPFLAGS=
@@ -1572,17 +1576,20 @@
cd ..
-echo -e "\nBuilding dependencies (if it blocks, try '$GNU_MAKE depend' to see
the problem)"
+echo ""
+echo "Building dependencies (if it blocks, try '$GNU_MAKE depend' to see the
problem)"
$GNU_MAKE depend 2> /dev/null > /dev/null || echo "Building dependencies
fails: try: '$GNU_MAKE depend'"
-echo -e -n "\nConfiguring MLDonkey" $MLDONKEY_VERSION
+echo ""
+printf "Configuring MLDonkey %s" "$MLDONKEY_VERSION"
if test ! -z "$SCM_VERSION"; then
- echo -n " - SCM: $SCM_VERSION"
+ printf " - SCM: %s" "$SCM_VERSION"
fi
-echo " completed."
+ec " completed.\n"
-echo -e "\nNetwork modules:"
-echo -n " - eDonkey "
+echo ""
+echo "Network modules:"
+printf " - eDonkey "
if test "$DONKEY" = "yes"; then
if test "$DONKEY_SUI" = "yes"; then
echo "enabled (eMule SUI enabled)"
@@ -1593,119 +1600,120 @@
echo " disabled"
fi
-echo -n " - BitTorrent "
+printf " - BitTorrent "
if test "$BITTORRENT" = "yes"; then
echo "enabled"
else
echo " disabled"
fi
-echo -n " - FileTP (aka wget) "
+printf " - FileTP (aka wget) "
if test "$FILETP" = "yes"; then
echo "enabled"
else
echo " disabled"
fi
-echo -n " - Fasttrack "
+printf " - Fasttrack "
if test "$FASTTRACK" = "yes"; then
echo "enabled"
else
echo " disabled"
fi
-echo -n " - Gnutella "
+printf " - Gnutella "
if test "$GNUTELLA" = "yes"; then
echo "enabled (warning: this network module is unmaintained)"
else
echo " disabled - unmaintained"
fi
-echo -n " - Gnutella2 "
+printf " - Gnutella2 "
if test "$GNUTELLA2" = "yes"; then
echo "enabled (warning: this network module is unmaintained)"
else
echo " disabled - unmaintained"
fi
-echo -n " - Direct Connect "
+printf " - Direct Connect "
if test "$DIRECT_CONNECT" = "yes"; then
echo "enabled"
else
echo " disabled"
fi
-echo -n " - Open Napster "
+printf " - Open Napster "
if test "$OPEN_NAPSTER" = "yes"; then
echo "enabled - currently not usable"
else
echo " disabled - currently not usable"
fi
-echo -n " - Soulseek "
+printf " - Soulseek "
if test "$SOULSEEK" = "yes"; then
echo "enabled - currently not usable"
else
echo " disabled - currently not usable"
fi
-echo -n " - OpenFT "
+printf " - OpenFT "
if test "$OPENFT" = "yes"; then
echo "enabled - currently not usable"
else
echo " disabled - currently not usable"
fi
-echo -e "\nCore features:"
+echo ""
+echo "Core features:"
echo " - zlib (required) enabled"
-echo -n " - threads "
+printf " - threads "
if test "$USE_PTHREAD" = "yes"; then
echo "enabled"
else
echo " disabled"
fi
-echo -n " - bzip2 "
+printf " - bzip2 "
if test "$BZIP2" = "yes"; then
echo "enabled"
else
echo " disabled"
fi
-echo -n " - iconv "
+printf " - iconv "
if test "$ICONV" = "yes"; then
echo "enabled"
else
echo " disabled"
fi
-echo -n " - libmagic "
+printf " - libmagic "
if test "$MAGIC" = "yes"; then
echo "enabled"
else
echo " disabled"
fi
-echo -n " - upnp & natpmp "
+printf " - upnp & natpmp "
if test "$UPNP_NATPMP" = "yes"; then
echo "enabled"
else
echo " disabled"
fi
-echo -n " - graphical stats "
+printf " - graphical stats "
if test "$GD" = "yes"; then
echo "enabled"
- echo -n " - png support "
+ printf " - png support "
if test "$GD_PNG" = "yes"; then
echo "enabled"
else
echo " disabled"
fi
- echo -n " - jpg support "
+ printf " - jpg support "
if test "$GD_JPG" = "yes"; then
echo "enabled"
else
@@ -1716,7 +1724,8 @@
fi
if test "$LABLGTK_CONFIG" = "yes"; then
- echo -n -e "\n - GUI support "
+ echo ""
+ printf "\n - GUI support "
if test "$GUI" = "newgui1"; then
echo "GTK1 newgui"
else
@@ -1736,17 +1745,21 @@
OCAML_TYPE="- byte code"
COMPILE_TARGET=".byte"
fi
-echo -e "\nCompilers:"
-echo -e " - Ocaml version $OCAMLVERSION $OCAML_TYPE"
-echo -e " - $CC version $CC_VERSION"
+echo ""
+printf "Compilers:"
+echo " - Ocaml version $OCAMLVERSION $OCAML_TYPE"
+echo " - $CC version $CC_VERSION"
if test "x$CXX" != "x"; then
- echo -e " - $CXX version $CXX_VERSION"
+ echo " - $CXX version $CXX_VERSION"
fi
-echo -e "\nNow execute '$GNU_MAKE' to start compiling. Good luck!"
+echo ""
+echo "\nNow execute '$GNU_MAKE' to start compiling. Good luck!"
-echo -e "\nTo compile a static code execute: $GNU_MAKE
mlnet$COMPILE_TARGET.static"
+echo ""
+echo "To compile a static code execute: $GNU_MAKE
mlnet$COMPILE_TARGET.static"
echo "To produce a release tarball execute: $GNU_MAKE
release.mlnet.static"
echo "To clean the build directory execute: $GNU_MAKE maintainerclean"
if test "$DONKEY_SUI" = "yes"; then
- echo -e "\nCompiling CryptoPP.cc can take several minutes, on slow machines
up to half an hour."
+ echo ""
+ echo "Compiling CryptoPP.cc can take several minutes, on slow machines up to
half an hour."
fi
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1550
retrieving revision 1.1551
diff -u -b -r1.1550 -r1.1551
--- distrib/ChangeLog 23 May 2012 17:49:37 -0000 1.1550
+++ distrib/ChangeLog 24 Jun 2012 07:58:09 -0000 1.1551
@@ -14,6 +14,9 @@
ChangeLog
=========
+2012/06/24
+7796: configure: fix non-portable use of echo (ygrek)
+
2012/05/23
7784: IP discover: Fix broken URL
-------------------------------------------------------------------------------
- [Mldonkey-commits] mldonkey config/configure.in distrib/ChangeLog,
mldonkey-commits <=