Changeset 427

Timestamp:

Jul 18, 2007 6:22:54 PM (13 years ago)

Author:

andreasw

Message:

added COIN_CHECK_FILE which also works for cross compilation

File:

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

trunk/coin.m4

@@ -208 +208 @@
 
 ###########################################################################
+#                            COIN_CHECK_FILE                              #
+###########################################################################
+
+# A simple replacement for AC_CHECK_FILE that works for cross compilation
+
+AC_DEFUN([AC_COIN_CHECK_FILE],
+[if test -r $1; then
+  $2
+  :
+else
+  $3
+  :
+fi
+])
+
+###########################################################################
 #                        COIN_THIRDPARTY_SUBDIRS                          #
 ###########################################################################
@@ -1501 +1517 @@
     correct_version='1.5.22'
     grep_version=`echo  $correct_version | sed -e 's/\\./\\\\\\./g'`
-    AC_CHECK_FILE([$want_dir/libtool/ltmain.sh],
-                  [have_ltmain=yes],
-                  [have_ltmain=no])
+    AC_COIN_CHECK_FILE([$want_dir/libtool/ltmain.sh],
+                       [have_ltmain=yes],
+                       [have_ltmain=no])
     AC_MSG_CHECKING([whether we are using the correct version ($correct_version) of libtool.])
     if test $have_ltmain = yes; then
@@ -1524 +1540 @@
     want_dir=$AUTOTOOLS_DIR/share
   fi
-  AC_CHECK_FILE([$want_dir/aclocal/libtool.m4],
-                [LIBTOOLM4="$want_dir/aclocal/libtool.m4"],
-                [AC_MSG_ERROR([I cannot find the libtool.m4 file.])])
+  AC_COIN_CHECK_FILE([$want_dir/aclocal/libtool.m4],
+                     [LIBTOOLM4="$want_dir/aclocal/libtool.m4"],
+                     [AC_MSG_ERROR([I cannot find the libtool.m4 file.])])
 
   # Check if we have an Externals file
@@ -2425 +2441 @@
 
     m4_ifval([$3],
-        [AC_CHECK_FILE([$$2INCDIR/$3],[],
+        [AC_COIN_CHECK_FILE([$$2INCDIR/$3],[],
              [AC_MSG_ERROR([Cannot find file $3 in $$2INCDIR])])])
 
@@ -2519 +2535 @@
   fi
 elif test "$use_asldir" != "no"; then
-  AC_CHECK_FILE([$use_asldir/$ampllib],[],
-                [AC_MSG_ERROR([ASL directory \"$use_asldir\" specified, but library missing])])
-  AC_CHECK_FILE([$use_asldir/asl.h],[],
-                [AC_MSG_ERROR([ASL directory \"$use_asldir\" specified, but header files are missing])])
+  AC_COIN_CHECK_FILE([$use_asldir/$ampllib],[],
+                     [AC_MSG_ERROR([ASL directory \"$use_asldir\" specified, but library missing])])
+  AC_COIN_CHECK_FILE([$use_asldir/asl.h],[],
+                     [AC_MSG_ERROR([ASL directory \"$use_asldir\" specified, but header files are missing])])
   use_asldir=`cd $use_asldir; pwd`
   case $build in
@@ -2915 +2931 @@
 
   # Check if hearders are there
-  AC_CHECK_FILE([$mumps_dir/include/dmumps_c.h],
-                [],
-                [AC_MSG_ERROR([I cannot find headers for MUMPS])])
+  AC_COIN_CHECK_FILE([$mumps_dir/include/dmumps_c.h],
+                     [],
+                     [AC_MSG_ERROR([I cannot find headers for MUMPS])])
   LIBS="$mumps_dir/lib/libdmumps.$libe $mumps_dir/lib/libpord.$libe $mumps_dir/libseq/libmpiseq.$libe $LIBS"
   ADDLIBS="$mumps_dir/lib/libdmumps.$libe $mumps_dir/lib/libpord.$libe $mumps_dir/libseq/libmpiseq.$libe $ADDLIBS"