[Mldonkey-commits] Changes to mldonkey/config/configure.in

[mldonkey-commits]

Index: mldonkey/config/configure.in
diff -u mldonkey/config/configure.in:1.223 mldonkey/config/configure.in:1.224
--- mldonkey/config/configure.in:1.223  Thu Oct  6 10:21:05 2005
+++ mldonkey/config/configure.in        Sun Oct  9 15:51:43 2005
@@ -13,7 +13,6 @@
 SUB_VERSION=4   # range 0-7 due to eMule limitations
 
 AC_CANONICAL_HOST
-AC_MSG_NOTICE(Building on $host)
 
 OS_FILES=unix
 OS_FILES2=unix
@@ -134,12 +133,6 @@
 if test ! -z "$SUB_VERSION3"; then
   MLDONKEY_VERSION=$MLDONKEY_VERSION.$SUB_VERSION3
 fi
-echo -n "Version: $MLDONKEY_VERSION"
-if test ! -z "$SCM_VERSION"; then
-  echo " - SCM: $SCM_VERSION"
-else
-  echo ""
-fi
 REQUIRED_OCAML=3.08.4
 DOWNLOAD_OCAML_MAJOR=3.08
 DOWNLOAD_OCAML=3.08.4
@@ -179,11 +172,11 @@
 AC_ARG_ENABLE(filetp,        [  --disable-filetp        allows you to remove 
support for fileTP], [FILETP="$enableval"])
 AC_ARG_ENABLE(gnutella, [  --disable-gnutella      allows you to remove 
support for Gnutella], [GNUTELLA="$enableval"])
 AC_ARG_ENABLE(gnutella2, [  --disable-gnutella2     allows you to remove 
support for Gnutella2], [GNUTELLA2="$enableval"])
-AC_ARG_ENABLE(soulseek, [  --disable-soulseek      allows you to remove 
support for SoulSeek], [SOULSEEK="$enableval"])
+#AC_ARG_ENABLE(soulseek, [  --disable-soulseek      allows you to remove 
support for SoulSeek], [SOULSEEK="$enableval"])
 AC_ARG_ENABLE(fasttrack,     [  --disable-fasttrack     allows you to remove 
support for FastTrack], [FASTTRACK="$enableval"])
-AC_ARG_ENABLE(opennap,       [  --disable-opennap       allows you to remove 
support for Open Napster], [OPEN_NAPSTER="$enableval"])
+#AC_ARG_ENABLE(opennap,       [  --disable-opennap       allows you to remove 
support for Open Napster], [OPEN_NAPSTER="$enableval"])
 #AC_ARG_ENABLE(directconnect, [  --disable-directconnect  allows you to remove 
support for Direct Connect], [DIRECT_CONNECT="$enableval"])
-AC_ARG_ENABLE(openft,        [  --disable-openft        allows you to remove 
support for OpenFT], [OPENFT="$enableval"])
+#AC_ARG_ENABLE(openft,        [  --disable-openft        allows you to remove 
support for OpenFT], [OPENFT="$enableval"])
 
 BATCH=no
 AC_ARG_ENABLE(batch, [  --enable-batch          reply YES to all queries in 
this script], [BATCH="$enableval"])
@@ -333,7 +326,6 @@
 if test -z "$ac_cv_prog_OCAMLC"; then
    BUILD_OCAML=yes
 else
-  echo "Testing ocaml version"
   OCAMLVERSION=`$OCAMLC -v | sed -n -e 's|.*version* *\(.*\)$|\1|p' `
   case "$OCAMLVERSION" in
     "$REQUIRED_OCAML"*) ;;
@@ -505,9 +497,8 @@
 AC_PATH_PROG(PERL, perl, perl)
 
 OCAMLVERSION=`$OCAMLC -v | sed -n -e 's|.*version* *\(.*\)$|\1|p' `
-echo "ocamlc version is $OCAMLVERSION"
-    REBUILD_OCAML=no
-  case "$OCAMLVERSION" in
+REBUILD_OCAML=no
+case "$OCAMLVERSION" in
     "$REQUIRED_OCAML"*) ;;
     3.08.3*) ;;
     3.08.2*)
@@ -539,7 +530,6 @@
   OCAMLLIB_EXT=cmxa
 
   OCAMLOPTVERSION=`$OCAMLOPT -v | sed -n -e 's|.*version* *\(.*\)$|\1|p' `
-  echo "ocamlopt version is $OCAMLOPTVERSION"
 
   test "$OCAMLOPTVERSION" = "$OCAMLVERSION" || {
     echo "********  Version $REQUIRED_OCAML of ocamlopt is required  
*********" 1>&2;
@@ -728,95 +718,61 @@
   if test "$DONKEY" = "yes"; then
     AC_CHECK_FILE(../src/networks/donkey,DONKEY=yes, [
       DONKEY=no
-      BAD_TARGETS="$BAD_TARGETS donkey"
     ])
-  else
-    DONKEY=no
-    BAD_TARGETS="$BAD_TARGETS donkey"
   fi
 
   if test "$OPEN_NAPSTER" = "yes" ; then
     AC_CHECK_FILE(../src/networks/opennap,OPEN_NAPSTER=yes, [
       OPEN_NAPSTER=no
-      BAD_TARGETS="$BAD_TARGETS open_napster"
     ])
-  else
-    BAD_TARGETS="$BAD_TARGETS open_napster"
   fi
 
 #  if test "$DIRECT_CONNECT" = "yes" ; then
 #    AC_CHECK_FILE(../src/networks/direct_connect,DIRECT_CONNECT=yes, [
       DIRECT_CONNECT=no
-      BAD_TARGETS="$BAD_TARGETS direct_connect(not working)"
 #    ])
-#  else
-#    BAD_TARGETS="$BAD_TARGETS direct_connect"
 #  fi
 
   if test "$GNUTELLA" = "yes"; then
        AC_CHECK_FILE(../src/networks/gnutella,GNUTELLA=yes, [
          GNUTELLA=no
-         BAD_TARGETS="$BAD_TARGETS gnutella"
        ])
-  else
-    GNUTELLA=no
-    BAD_TARGETS="$BAD_TARGETS gnutella"
   fi
 
   if test "$GNUTELLA2" = "yes"; then
        AC_CHECK_FILE(../src/networks/gnutella2,GNUTELLA2=yes, [
          GNUTELLA2=no
-         BAD_TARGETS="$BAD_TARGETS gnutella2"
        ])
-  else
-    GNUTELLA2=no
-    BAD_TARGETS="$BAD_TARGETS gnutella2"
   fi
 
   if test "$BITTORRENT" = "yes"; then
     AC_CHECK_FILE(../src/networks/bittorrent,BITTORRENT=yes, [
       BITTORRENT=no
-      BAD_TARGETS="$BAD_TARGETS bittorrent"
     ])
-  else
-    BAD_TARGETS="$BAD_TARGETS bittorrent"
   fi
 
   if test "$FILETP" = "yes"; then
     AC_CHECK_FILE(../src/networks/fileTP,FILETP=yes, [
       FILETP=no
-      BAD_TARGETS="$BAD_TARGETS fileTP"
     ])
-  else
-    BAD_TARGETS="$BAD_TARGETS fileTP"
   fi
 
   if test "$SOULSEEK" = "yes"; then
        AC_CHECK_FILE(../src/networks/soulseek,SOULSEEK=yes, [
          SOULSEEK=no
-         BAD_TARGETS="$BAD_TARGETS soulseek"
        ])
-  else
-    SOULSEEK=no
-    BAD_TARGETS="$BAD_TARGETS soulseek"
   fi
 
   if test "$OPENFT" = "yes" ; then
     AC_CHECK_FILE(../src/networks/openFT,OPENFT=yes, [
       OPENFT=no
-      BAD_TARGETS="$BAD_TARGETS openFT(obsolete)"
     ])
-  else
-    BAD_TARGETS="$BAD_TARGETS openFT(obsolete)"
   fi
 
   if test "$FASTTRACK" = "yes" ; then
     AC_CHECK_FILE(../src/networks/fasttrack,FASTTRACK=yes, [
       FASTTRACK=no
-      BAD_TARGETS="$BAD_TARGETS FastTrack(devel)"
     ])
-  else
-    BAD_TARGETS="$BAD_TARGETS FastTrack(devel)"
   fi
 
 if test "$DONKEY" = "yes" ; then
@@ -825,18 +781,19 @@
     DONKEY=yes
     AC_CHECK_FILE(../src/networks/server,DONKEY_SERVER=yes, [
       DONKEY_SERVER=no
-      BAD_TARGETS="$BAD_TARGETS donkey_server"
     ])
   ], [
       DONKEY=no
       DONKEY_SERVER=no
-      BAD_TARGETS="$BAD_TARGETS donkey_server donkey_client"
   ])
-
-  else
-      BAD_TARGETS="$BAD_TARGETS donkey_server donkey_client"
 fi
 
+if test "$USE_PTHREAD" = "no"; then
+ PTHREAD_LIBS=""
+ echo "Dont use threads"
+else
+  ACX_PTHREAD
+fi
 
 # Check for GTK only if we want to build the GUI
 if test ! "$GUI" = "no"; then
@@ -997,53 +954,29 @@
    IM=no
 fi
 
-if test "$USE_PTHREAD" = "no"; then
- PTHREAD_LIBS=""
- echo "Dont use threads"
+if test "$LABLGTK_CONFIG" = "no"; then
+  GUI="no"
 else
-  ACX_PTHREAD
-fi
-
-
-AC_MSG_CHECKING(compile GTK GUI)
-  if test "$LABLGTK_CONFIG" = "no"; then
-        AC_MSG_RESULT(no)
-        BAD_TARGETS="$BAD_TARGETS $GUIS"
-        RELEASENAME="$RELEASENAME-nogui"
-       GUI="no"
+  MORE_TARGETS="$MORE_TARGETS $GUIS"
+  GTK=gtk
+  AC_MSG_CHECKING(GToolbox.popup_menu args)
+  if test "$OS_FILES" = "mingw"; then
+    GTOOLBOX="`$OCAMLC -where`\labl$GTK\gToolbox.mli"
   else
-        MORE_TARGETS="$MORE_TARGETS $GUIS"
-        AC_MSG_RESULT(yes)
-       GTK=gtk
-        if test "$GUI" = "newgui1"; then
-        echo "compiling newgui"
-        else
-        if test "$GUI" = "newgui2"; then
-        echo "compiling gtk2 gui"
-       GTK=gtk2
-        else
-        echo "compiling oldgui"
-        fi
-        fi
-        AC_MSG_CHECKING(GToolbox.popup_menu args)
-        if test "$OS_FILES" = "mingw"; then
-          GTOOLBOX="`$OCAMLC -where`\labl$GTK\gToolbox.mli"
-       else
-        GTOOLBOX="`$OCAMLC -where`/labl$GTK/gToolbox.mli"
-       fi
-        grep popup $GTOOLBOX | grep -i button 2> /dev/null && GTOOLBOX_ARGS=new
-        if test "$GTOOLBOX_ARGS" = "new"; then
-          GTOOLBOX_POPUPMENU=' ~button: button ~time: time '
-          AC_MSG_RESULT(new)
-        else
-          GTOOLBOX_POPUPMENU=' ~x: button ~y: time '
-          AC_MSG_RESULT(old)
-        fi
-       echo "---------------------------------------------------------"
-       echo "End of GTK GUI configuration."
-       echo "---------------------------------------------------------"
+    GTOOLBOX="`$OCAMLC -where`/labl$GTK/gToolbox.mli"
   fi
-
+  grep popup $GTOOLBOX | grep -i button 2> /dev/null && GTOOLBOX_ARGS=new
+  if test "$GTOOLBOX_ARGS" = "new"; then
+    GTOOLBOX_POPUPMENU=' ~button: button ~time: time '
+    AC_MSG_RESULT(new)
+  else
+    GTOOLBOX_POPUPMENU=' ~x: button ~y: time '
+    AC_MSG_RESULT(old)
+  fi
+  echo "---------------------------------------------------------"
+  echo "End of GTK GUI configuration."
+  echo "---------------------------------------------------------"
+fi
 
 AC_CHECK_PROG(COMPRESS, bzip2, bzip2)
 AC_CHECK_PROG(COMPRESS, gzip, gzip)
@@ -1156,15 +1089,12 @@
   fi
   LIBS=$SAVE_LIBS
 fi
-AC_MSG_CHECKING(support for graphical statistics)
 if test "$GD" != "no"; then
   HAS_GD=true
   cp -f ../src/daemon/common/commonGraphics.gd.ml 
../src/daemon/common/commonGraphics.ml
-  AC_MSG_RESULT(yes)
 else
   HAS_GD=false
   cp -f ../src/daemon/common/commonGraphics.nogd.ml 
../src/daemon/common/commonGraphics.ml
-  AC_MSG_RESULT(no)
 fi
 
 MD4ARCH=$arch
@@ -1293,4 +1223,138 @@
 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 "The following modules will not be compiled: {" $BAD_TARGETS "}"
+echo -e -n "\nConfiguring MLDonkey" $MLDONKEY_VERSION
+if test ! -z "$SCM_VERSION"; then
+  echo -n " - SCM: $SCM_VERSION"
+fi
+echo " completed."
+
+echo -e "\nNetwork modules:"
+echo -n " - eDonkey           "
+if test "$DONKEY" = "yes"; then
+  echo "enabled"
+else
+  echo "        disabled"
+fi
+
+echo -n " - BitTorrent        "
+if test "$BITTORRENT" = "yes"; then
+  echo "enabled"
+else
+  echo "        disabled"
+fi
+
+echo -n " - FileTP (aka wget) "
+if test "$FILETP" = "yes"; then
+  echo "enabled"
+else
+  echo "        disabled"
+fi
+
+echo -n " - Fasttrack         "
+if test "$FASTTRACK" = "yes"; then
+  echo "enabled"
+else
+  echo "        disabled"
+fi
+
+echo -n " - Gnutella          "
+if test "$GNUTELLA" = "yes"; then
+  echo "enabled"
+else
+  echo "        disabled"
+fi
+
+echo -n " - Gnutella2         "
+if test "$GNUTELLA2" = "yes"; then
+  echo "enabled"
+else
+  echo "        disabled"
+fi
+
+echo -n " - Open Napster      "
+if test "$OPEN_NAPSTER" = "yes"; then
+  echo "enabled          - currently not usable"
+else
+  echo "        disabled - currently not usable"
+fi
+
+echo -n " - Direct Connect    "
+if test "$DIRECT_CONNECT" = "yes"; then
+  echo "enabled          - currently not usable"
+else
+  echo "        disabled - currently not usable"
+fi
+
+echo -n " - Soulseek          "
+if test "$SOULSEEK" = "yes"; then
+  echo "enabled          - currently not usable"
+else
+  echo "        disabled - currently not usable"
+fi
+
+echo -n " - OpenFT            "
+if test "$OPENFT" = "yes"; then
+  echo "enabled          - currently not usable"
+else
+  echo "        disabled - currently not usable"
+fi
+
+echo -e "\nCore features:"
+
+echo -n " - threads           "
+if test "$USE_PTHREAD" = "yes"; then
+  echo "enabled"
+else
+  echo "        disabled"
+fi
+
+echo " - zlib              enabled"
+echo -n " - bzip2             "
+if test "$BZIP2" = "yes"; then
+  echo "enabled"
+else
+  echo "        disabled"
+fi
+
+echo -n " - iconv             "
+if test "$ICONV" = "yes"; then
+  echo "enabled"
+else
+  echo "        disabled"
+fi
+
+echo -n " - graphical stats   "
+if test "$GD" = "yes"; then
+  echo "enabled"
+  echo -n "   - png support     "
+  if test "$GD_PNG" = "yes"; then
+    echo "enabled"
+  else
+    echo "        disabled"
+  fi
+
+  echo -n "   - jpg support     "
+  if test "$GD_JPG" = "yes"; then
+    echo "enabled"
+  else
+    echo "        disabled"
+  fi
+else
+  echo "        disabled"
+fi
+
+if test "$LABLGTK_CONFIG" = "yes"; then
+  echo -n -e "\n - GUI support       "
+  if test "$GUI" = "newgui1"; then
+    echo "GTK1 newgui"
+  else
+    if test "$GUI" = "newgui2"; then
+      echo "GTK2 GUI"
+    else
+      echo "GTK1 oldgui"
+    fi
+  fi
+fi
+
+echo -e "\nNow execute '$GNU_MAKE' to start compiling with Ocaml 
$OCAMLVERSION. Good luck!"