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

[mldonkey-commits]

Index: mldonkey/config/configure.in
diff -u mldonkey/config/configure.in:1.196 mldonkey/config/configure.in:1.197
--- mldonkey/config/configure.in:1.196  Sun Jul 17 23:07:55 2005
+++ mldonkey/config/configure.in        Tue Jul 19 17:39:49 2005
@@ -18,6 +18,22 @@
 #MINOR_VERSION=0
 #SUB_VERSION1=0   # range 0-7 due to eMule limitations
 
+AC_CANONICAL_HOST
+AC_MSG_NOTICE(Building on $host)
+
+OS_FILES=unix
+OS_FILES2=unix
+
+case $host in
+  *mingw*)
+    OS_FILES=mingw
+    OS_FILES2=mingw
+    ;;
+  *cygwin*)
+    OS_FILES2=cygwin
+    ;;
+esac
+
 case "`uname -s`" in
   *win32* | *WIN32* | MINGW* | CYGWIN* ) 
      SYSTEM="windows"
@@ -62,7 +78,13 @@
          if [ test "$SYSTEM" = "openbsd"]; then
            AC_CHECK_PROG(GREP, grep, grep)
            if test "$ac_cv_prog_GREP" = "grep"; then
-             SCM_VERSION=`$STAT -f %a ./CVS/Entries | grep -v Entries | $SED 
-e 's/\(.*\) \(.*\) \(.*\) \(.*\)/\1-\2-\4 \3/'`
+             SCM_VERSION=`$STAT -f %a ./CVS/Entries | $GREP -v Entries | $SED 
-e 's/\(.*\) \(.*\) \(.*\) \(.*\)/\1-\2-\4 \3/'`
+           fi
+         else
+           if [ test "$SYSTEM" = "windows"]; then
+             AC_CHECK_PROG(GREP, grep, grep)
+             if test "$ac_cv_prog_GREP" = "grep"; then
+               SCM_VERSION=`$STAT ./CVS/Entries  | $GREP Modify | $SED -e 
's/\(.*\) \(.*\) \(.*\) \(.*\) \(.*\)/\5-\2-\3 \4/'`
            fi
          else
            SCM_VERSION=`$STAT -Lc %y ./CVS/Entries | $SED -e 's#\.[0-9]*##' | 
$CUT -c0-19`
@@ -72,6 +94,7 @@
     fi
   fi
 fi
+fi
 MLDONKEY_VERSION=$MAJOR_VERSION.$MINOR_VERSION
 if test ! "$SUB_VERSION1" = "0"; then
   MLDONKEY_VERSION=$MLDONKEY_VERSION.$SUB_VERSION1
@@ -169,7 +192,11 @@
 AC_ARG_ENABLE(pthread, [  --disable-pthread       allows you to disable 
pthread support in mldonkey], [PTHREAD_LIBS="$enableval"])
 AC_ARG_ENABLE(pthread-lib, [  --enable-pthread-lib    legacy option], 
[PTHREAD_LIBS="$enableval"])
 
+if [ test "$SYSTEM" = "windows"]; then
+  ICONV=no
+else
 ICONV=yes
+fi
 AC_ARG_ENABLE(iconv,       [  --disable-iconv         disable the use of iconv 
for compiling on broken windows environments], [ICONV="$enableval"])
 
 GD=yes
@@ -188,7 +215,6 @@
 
 
 
-AC_CANONICAL_HOST
 AC_CHECK_PROG(CC,gcc3,"gcc3",cc)
 AC_PROG_CC
 AC_EXEEXT
@@ -220,10 +246,6 @@
 AC_PATH_PROG(OCAMLC,ocamlc.opt,"",[$LOCAL_DIR/bin:$PATH])
 AC_CHECK_PROG(OCAMLC,ocamlc,ocamlrun ocamlc)
 
-
-
-echo $host
-
 case "$host" in
   alpha*-*-osf*)                arch=alpha; system=digital;;
   alpha*-*-linux*)              arch=alpha; system=linux;;
@@ -562,8 +584,6 @@
 # On linux plaforms, we will have to check that includes from kernel are
 # available. glibc version test was shamelessly taken from
 # http://public.activestate.com/gsar/APC/perl-5.8.x/Configure
-OS_FILES=unix
-OS_FILES2=unix
 GLIBC_VERSION=""
 case $host in
         *linux*)   
@@ -607,11 +627,6 @@
            AC_MSG_RESULT($GLIBC_VERSION)
            rm -f try try.*
         ;;
-        *mingw*)
-           OS_FILES=mingw
-           OS_FILES2=mingw
-        ;;
-        *cygwin*) OS_FILES2=cygwin;;
         *)         ;;
 esac