Changeset 332

Timestamp:

Jun 11, 2007 12:06:26 AM (14 years ago)

Author:

andreasw

Message:

some fixes for MSys

Location:

trunk

Files:

• coin.m4 (modified) (2 diffs)
• compile_f2c/compile_f2c (modified) (5 diffs)

trunk/coin.m4

@@ -1796 +1796 @@
   # Correct cygpath for minGW (ToDo!)
   AC_MSG_NOTICE([Build is "$build".])
+  mydos2unix='| dos2unix'
   case $build in
     *-mingw*)
       CYGPATH_W=echo
+      mydos2unix=
       ;;
   esac
@@ -1822 +1824 @@
             -e 's%lib /OUT:%lib -OUT:%' \
             -e "s%cygpath -w%$CYGPATH_W%" \
-            -e 's%$AR x \\$f_ex_an_ar_oldlib%bla=\\`lib -nologo -list \\$f_ex_an_ar_oldlib | xargs echo | dos2unix\\`; echo \\$bla; for i in \\$bla; do lib -nologo -extract:\\$i \\$f_ex_an_ar_oldlib; done%' \
+            -e 's%$AR x \\$f_ex_an_ar_oldlib%bla=\\`lib -nologo -list \\$f_ex_an_ar_oldlib | xargs echo '"$mydos2unix"'\\`; echo \\$bla; for i in \\$bla; do lib -nologo -extract:\\$i \\$f_ex_an_ar_oldlib; done%' \
             -e 's/$AR t/lib -nologo -list/' \
             -e 's%f_ex_an_ar_oldlib="\($?*1*\)"%f_ex_an_ar_oldlib='\`"$CYGPATH_W"' \1`%' \ 

trunk/compile_f2c/compile_f2c

@@ -20 +20 @@
 ########################################################################
 
+#Find out what the 
+if test `which cygpath | wc -l` -eq 0; then
+  CYGPATH_W=echo
+else
+  CYGPATH_W='cygpath -w'
+fi
 
-f2clib=`cygpath -w $f2clibdir/vcf2c.lib`
-mainobj=`cygpath -w $f2clibdir/main.obj`
+if test "$F2C_CC" = ""; then
+  F2C_CC=cl
+fi
+
+f2clib=`$CYGPATH_W $f2clibdir/vcf2c.lib`
+mainobj=`$CYGPATH_W $f2clibdir/main.obj`
 
 # Get rid of the \
@@ -28 +38 @@
 mainobj=`echo $mainobj | sed -e s'!\\\\!/!g'`
 
-if test "$CC" = ""; then
-  CC=cl
-fi
 
 if test "$#" -eq 1 && test "$1" = "-FLIBS"; then
@@ -37 +44 @@
 fi
 
-cincs=-I`cygpath -w $f2clibdir`
+cincs="-I`$CYGPATH_W $f2clibdir`"
 
 options=
@@ -89 +96 @@
 if test "$fsrc" != ""; then
   for f in $fsrc; do
-    cf=`echo $f | sed -e 's|.[fF]$|.c|'`
+    cf=`echo $f | sed -e 's|.[fF]$|.c|' -e 's|.*/||'`
     csrc="$csrc $cf"
   done
 
+  echo f2c $incs $fsrc
   f2c $incs $fsrc
   f2c_status=$?
@@ -101 +109 @@
 fi
 
+
 if test "$outfile"; then
-  cout="-o `cygpath -w $outfile`"
+  cout="-o `$CYGPATH_W $outfile`"
 fi
 
-echo $CC $options $cincs $csrc $objs $cout $mainobj $f2clib
+echo $F2C_CC $options $cincs $csrc $objs $cout $mainobj $f2clib
 
-$CC $options $cincs $csrc $objs $cout $mainobj $f2clib
+$F2C_CC $options $cincs $csrc $objs $cout $mainobj $f2clib
 cl_status=$?