Changeset 14

Timestamp:

May 17, 2006 1:01:38 AM (14 years ago)

Author:

andreasw

Message:

several fixes for Cygwin; automatically gunzip data files of zlib not available

File:

• trunk/coin.m4 (modified) (11 diffs)

trunk/coin.m4

@@ -130 +130 @@
 
 AC_DEFUN([AC_COIN_SRCDIR_INIT],
-[# Initialize the ADDLIBS variable (a number of library require -lm)
-ADDLIBS="" #"-lm"
+[# Initialize the ADDLIBS variable
+ADDLIBS=
 AC_SUBST(ADDLIBS)
 
@@ -245 +245 @@
         case "$CXX" in
           cl | */cl)
-            coin_opt_cxxflags='-Ot1'
-            coin_add_cxxflags='-nologo -EHsc -GR -MT'
+            coin_opt_cxxflags='-O2'
+            coin_add_cxxflags='-nologo -GX -GR -MT'
             coin_dbg_cxxflags='-Yd'
             ;;
@@ -481 +481 @@
         case "$CC" in
           cl | */cl)
-            coin_opt_cflags='-Ot1'
+            coin_opt_cflags='-O2'
             coin_add_cflags='-nologo'
             coin_dbg_cflags='-Yd'
@@ -1001 +1001 @@
           -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\\`; echo dd \\$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\\`; 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`%' \ 
       libtool > conftest.bla
 
@@ -1097 +1098 @@
 # to check if a user wants to compile GNU packges (such as readline or
 # zlib) into the executable.  By default, GNU packages are disabled.
+# This also defines the automake conditional COIN_ENABLE_GNU_PACKAGES
 
 AC_DEFUN([AC_COIN_ENABLE_GNU_PACKAGES],
@@ -1119 +1121 @@
 AC_BEFORE([$0],[AC_COIN_FINISH])
 
+coin_has_zlib=no
 if test $coin_enable_gnu = yes; then
-  coin_has_zlib=no
   AC_COIN_CHECK_HEADER([zlib.h],[coin_has_zlib=yes])
 
@@ -1133 +1135 @@
   fi
 fi
+
+AM_CONDITIONAL(COIN_HAS_ZLIB,test x$coin_has_zlib = xyes)
 ]) # AC_COIN_CHECK_ZLIB
 
@@ -1149 +1153 @@
 AC_BEFORE([$0],[AC_COIN_FINISH])
 
+coin_has_bzlib=no
 if test $coin_enable_gnu = yes; then
-  coin_has_bzlib=no
   AC_COIN_CHECK_HEADER([bzlib.h],[coin_has_bzlib=yes])
 
@@ -1182 +1186 @@
 AC_BEFORE([$0],[AC_COIN_FINISH])
 
+coin_has_readline=no
 if test $coin_enable_gnu = yes; then
-  coin_has_readline=no
   AC_COIN_CHECK_HEADER([readline/readline.h],
                        [coin_has_readline=yes],[],
@@ -1244 +1248 @@
 # argument in an "ls" command) and sets up the variables EXAMPLE_FILES
 # and EXAMPLE_CLEAN_FILES.  If this is a VPATH configuration, it also
-# creates soft links to the example files
+# creates soft links to the example files.
 
 AC_DEFUN([AC_COIN_EXAMPLE_FILES],
-[AC_REQUIRE([AC_COIN_CHECK_VPATH])
+[AC_REQUIRE([AC_COIN_CHECK_ZLIB])
+AC_REQUIRE([AC_COIN_CHECK_VPATH])
 files=`cd $srcdir; ls $1`
 # We need to do the following loop to make sure that are no newlines
@@ -1266 +1271 @@
 fi
 
+# In case there are compressed files, we create a variable with the
+# uncompressed names
+EXAMPLE_UNCOMPRESSED_FILES=
+for file in $EXAMPLE_FILES; do
+  case $file in
+    *.gz)
+      EXAMPLE_UNCOMPRESSED_FILES="$EXAMPLE_UNCOMPRESSED_FILES `echo $file | sed -e s/.gz//`"
+      ;;
+  esac
+done
+
+AC_SUBST(EXAMPLE_UNCOMPRESSED_FILES)
 AC_SUBST(EXAMPLE_FILES)
 AC_SUBST(EXAMPLE_CLEAN_FILES)