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

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Branch:         
Changes by:     spiralvoice <address@hidden>    06/01/11 18:49:19

Modified files:
        config         : configure.in 
        distrib        : ChangeLog 

Log message:
        patch #4782

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/config/configure.in.diff?tr1=1.243&tr2=1.244&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/distrib/ChangeLog.diff?tr1=1.666&tr2=1.667&r1=text&r2=text

Patches:
Index: mldonkey/config/configure.in
diff -u mldonkey/config/configure.in:1.243 mldonkey/config/configure.in:1.244
--- mldonkey/config/configure.in:1.243  Thu Jan  5 02:03:34 2006
+++ mldonkey/config/configure.in        Wed Jan 11 18:49:18 2006
@@ -636,9 +636,6 @@
         *)         ;;
 esac
 
-AC_MSG_CHECKING(Additionnal includes)
-AC_MSG_RESULT($CONFIG_INCLUDES)
-
 OCAMLLIB=`$OCAMLC -where`
 
 if test -f $OCAMLLIB/lablgl.cma; then
@@ -650,77 +647,113 @@
 fi
 AC_MSG_NOTICE(checking for activated networks)
   if test "$DONKEY" = "yes"; then
-    AC_CHECK_FILE(../src/networks/donkey,DONKEY=yes, [
+    AC_MSG_CHECKING(eDonkey)
+    if test -d ../src/networks/donkey; then
+      AC_MSG_RESULT(yes)
+#      AC_MSG_CHECKING(eDonkey server)
+#      if test -d ../src/networks/server; then
+#        AC_MSG_RESULT(no)
+#        DONKEY_SERVER=no
+#      else
+#        AC_MSG_RESULT(no)
+#        DONKEY_SERVER=no
+#      fi
+    else
       DONKEY=no
-    ])
+      AC_MSG_RESULT(no)
+    fi
   fi
 
-  if test "$OPEN_NAPSTER" = "yes" ; then
-    AC_CHECK_FILE(../src/networks/opennap,OPEN_NAPSTER=yes, [
-      OPEN_NAPSTER=no
-    ])
+  if test "$BITTORRENT" = "yes"; then
+    AC_MSG_CHECKING(BitTorrent)
+    if test -d ../src/networks/bittorrent; then
+      AC_MSG_RESULT(yes)
+    else
+      BITTORRENT=no
+      AC_MSG_RESULT(no)
+    fi
   fi
 
-#  if test "$DIRECT_CONNECT" = "yes" ; then
-#    AC_CHECK_FILE(../src/networks/direct_connect,DIRECT_CONNECT=yes, [
-      DIRECT_CONNECT=no
-#    ])
-#  fi
+  if test "$FILETP" = "yes"; then
+    AC_MSG_CHECKING(FileTP)
+    if test -d ../src/networks/fileTP; then
+      AC_MSG_RESULT(yes)
+    else
+      FILETP=no
+      AC_MSG_RESULT(no)
+    fi
+  fi
 
   if test "$GNUTELLA" = "yes"; then
-       AC_CHECK_FILE(../src/networks/gnutella,GNUTELLA=yes, [
-         GNUTELLA=no
-       ])
+    AC_MSG_CHECKING(Gnutella)
+    if test -d ../src/networks/gnutella; then
+      AC_MSG_RESULT(yes)
+    else
+      GNUTELLA=no
+      AC_MSG_RESULT(no)
+    fi
   fi
 
   if test "$GNUTELLA2" = "yes"; then
-       AC_CHECK_FILE(../src/networks/gnutella2,GNUTELLA2=yes, [
-         GNUTELLA2=no
-       ])
+    AC_MSG_CHECKING(G2)
+    if test -d ../src/networks/gnutella2; then
+      AC_MSG_RESULT(yes)
+    else
+      GNUTELLA2=no
+      AC_MSG_RESULT(no)
+    fi
   fi
 
-  if test "$BITTORRENT" = "yes"; then
-    AC_CHECK_FILE(../src/networks/bittorrent,BITTORRENT=yes, [
-      BITTORRENT=no
-    ])
+  if test "$FASTTRACK" = "yes"; then
+    AC_MSG_CHECKING(Fasttrack)
+    if test -d ../src/networks/fasttrack; then
+      AC_MSG_RESULT(yes)
+    else
+      FASTTRACK=no
+      AC_MSG_RESULT(no)
+    fi
   fi
 
-  if test "$FILETP" = "yes"; then
-    AC_CHECK_FILE(../src/networks/fileTP,FILETP=yes, [
-      FILETP=no
-    ])
+  if test "$DIRECT_CONNECT" = "yes"; then
+    AC_MSG_CHECKING(DirectConnect)
+    if test -d ../src/networks/direct_connect; then
+      AC_MSG_RESULT(yes)
+    else
+      DIRECT_CONNECT=no
+      AC_MSG_RESULT(no)
+    fi
   fi
 
   if test "$SOULSEEK" = "yes"; then
-       AC_CHECK_FILE(../src/networks/soulseek,SOULSEEK=yes, [
-         SOULSEEK=no
-       ])
+    AC_MSG_CHECKING(Soulseek)
+    if test -d ../src/networks/soulseek; then
+      AC_MSG_RESULT(yes)
+    else
+      SOULSEEK=no
+      AC_MSG_RESULT(no)
+    fi
   fi
 
-  if test "$OPENFT" = "yes" ; then
-    AC_CHECK_FILE(../src/networks/openFT,OPENFT=yes, [
-      OPENFT=no
-    ])
+  if test "$OPEN_NAPSTER" = "yes"; then
+    AC_MSG_CHECKING(OpenNapster)
+    if test -d ../src/networks/opennap; then
+      AC_MSG_RESULT(yes)
+    else
+      OPEN_NAPSTER=no
+      AC_MSG_RESULT(no)
+    fi
   fi
 
-  if test "$FASTTRACK" = "yes" ; then
-    AC_CHECK_FILE(../src/networks/fasttrack,FASTTRACK=yes, [
-      FASTTRACK=no
-    ])
+  if test "$OPENFT" = "yes"; then
+    AC_MSG_CHECKING(OpenFT)
+    if test -d ../src/networks/openFT; then
+      AC_MSG_RESULT(yes)
+    else
+      OPENFT=no
+      AC_MSG_RESULT(no)
+    fi
   fi
 
-if test "$DONKEY" = "yes" ; then
-
-  AC_CHECK_FILE(../src/networks/donkey,[
-    DONKEY=yes
-    AC_CHECK_FILE(../src/networks/server,DONKEY_SERVER=yes, [
-      DONKEY_SERVER=no
-    ])
-  ], [
-      DONKEY=no
-      DONKEY_SERVER=no
-  ])
-fi
 
 if test "$USE_PTHREAD" = "no"; then
  PTHREAD_LIBS=""
@@ -881,9 +914,13 @@
 fi
 
 if test "$IM" = "yes" ; then
-  AC_CHECK_FILE(../src/im,IM=yes, [
-  IM=no
-  ])
+  AC_MSG_CHECKING(IM)
+  if test -d ../src/im; then
+    AC_MSG_RESULT(yes)
+    IM=yes
+  else
+    IM=no
+  fi
 else
    IM=no
 fi
Index: mldonkey/distrib/ChangeLog
diff -u mldonkey/distrib/ChangeLog:1.666 mldonkey/distrib/ChangeLog:1.667
--- mldonkey/distrib/ChangeLog:1.666    Mon Jan  9 00:26:16 2006
+++ mldonkey/distrib/ChangeLog  Wed Jan 11 18:49:18 2006
@@ -14,6 +14,9 @@
 ChangeLog
 =========
 
+2006/01/11
+4782: Configure: Replace AC_CHECK_FILE with "test -d" to allow cross-compile
+
 2006/01/09
 4770: Change file opening mechanism, open rw only when needed (pango)
       new verbosity option "file" to control Unix32 file handling