Changeset 427
- Timestamp:
- Jul 18, 2007 6:22:54 PM (14 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/coin.m4
r426 r427 208 208 209 209 ########################################################################### 210 # COIN_CHECK_FILE # 211 ########################################################################### 212 213 # A simple replacement for AC_CHECK_FILE that works for cross compilation 214 215 AC_DEFUN([AC_COIN_CHECK_FILE], 216 [if test -r $1; then 217 $2 218 : 219 else 220 $3 221 : 222 fi 223 ]) 224 225 ########################################################################### 210 226 # COIN_THIRDPARTY_SUBDIRS # 211 227 ########################################################################### … … 1501 1517 correct_version='1.5.22' 1502 1518 grep_version=`echo $correct_version | sed -e 's/\\./\\\\\\./g'` 1503 AC_C HECK_FILE([$want_dir/libtool/ltmain.sh],1504 [have_ltmain=yes],1505 [have_ltmain=no])1519 AC_COIN_CHECK_FILE([$want_dir/libtool/ltmain.sh], 1520 [have_ltmain=yes], 1521 [have_ltmain=no]) 1506 1522 AC_MSG_CHECKING([whether we are using the correct version ($correct_version) of libtool.]) 1507 1523 if test $have_ltmain = yes; then … … 1524 1540 want_dir=$AUTOTOOLS_DIR/share 1525 1541 fi 1526 AC_C HECK_FILE([$want_dir/aclocal/libtool.m4],1527 [LIBTOOLM4="$want_dir/aclocal/libtool.m4"],1528 [AC_MSG_ERROR([I cannot find the libtool.m4 file.])])1542 AC_COIN_CHECK_FILE([$want_dir/aclocal/libtool.m4], 1543 [LIBTOOLM4="$want_dir/aclocal/libtool.m4"], 1544 [AC_MSG_ERROR([I cannot find the libtool.m4 file.])]) 1529 1545 1530 1546 # Check if we have an Externals file … … 2425 2441 2426 2442 m4_ifval([$3], 2427 [AC_C HECK_FILE([$$2INCDIR/$3],[],2443 [AC_COIN_CHECK_FILE([$$2INCDIR/$3],[], 2428 2444 [AC_MSG_ERROR([Cannot find file $3 in $$2INCDIR])])]) 2429 2445 … … 2519 2535 fi 2520 2536 elif test "$use_asldir" != "no"; then 2521 AC_C HECK_FILE([$use_asldir/$ampllib],[],2522 [AC_MSG_ERROR([ASL directory \"$use_asldir\" specified, but library missing])])2523 AC_C HECK_FILE([$use_asldir/asl.h],[],2524 [AC_MSG_ERROR([ASL directory \"$use_asldir\" specified, but header files are missing])])2537 AC_COIN_CHECK_FILE([$use_asldir/$ampllib],[], 2538 [AC_MSG_ERROR([ASL directory \"$use_asldir\" specified, but library missing])]) 2539 AC_COIN_CHECK_FILE([$use_asldir/asl.h],[], 2540 [AC_MSG_ERROR([ASL directory \"$use_asldir\" specified, but header files are missing])]) 2525 2541 use_asldir=`cd $use_asldir; pwd` 2526 2542 case $build in … … 2915 2931 2916 2932 # Check if hearders are there 2917 AC_C HECK_FILE([$mumps_dir/include/dmumps_c.h],2918 [],2919 [AC_MSG_ERROR([I cannot find headers for MUMPS])])2933 AC_COIN_CHECK_FILE([$mumps_dir/include/dmumps_c.h], 2934 [], 2935 [AC_MSG_ERROR([I cannot find headers for MUMPS])]) 2920 2936 LIBS="$mumps_dir/lib/libdmumps.$libe $mumps_dir/lib/libpord.$libe $mumps_dir/libseq/libmpiseq.$libe $LIBS" 2921 2937 ADDLIBS="$mumps_dir/lib/libdmumps.$libe $mumps_dir/lib/libpord.$libe $mumps_dir/libseq/libmpiseq.$libe $ADDLIBS"
Note: See TracChangeset
for help on using the changeset viewer.