Changeset 3001


Ignore:
Timestamp:
Oct 18, 2013 6:17:21 AM (6 years ago)
Author:
stefan
Message:

refine some tests for existing files

  • use test -f instead of test -r to check for libtool script to avoid confusion with an existing libtool directory (see Ipopt ticket 222)
  • some other changes from test -e to test -f or similar
File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/coin.m4

    r2963 r3001  
    17871787
    17881788LIBTOOL=
    1789 if test -r ../libtool; then
     1789if test -f ../libtool; then
    17901790  coin_config_dir=..
    17911791  LIBTOOL='$(SHELL) $(top_builddir)/../libtool'
    17921792fi
    17931793if test "x$LIBTOOL" = x; then
    1794   if test -r ../../libtool; then
     1794  if test -f ../../libtool; then
    17951795    coin_config_dir=../..
    17961796    LIBTOOL='$(SHELL) $(top_builddir)/../../libtool'
     
    27042704esac
    27052705
    2706 if test -r $m4_toupper(COIN_DATA_$1_PATH); then
     2706if test -d $m4_toupper(COIN_DATA_$1_PATH); then
    27072707  AC_DEFINE_UNQUOTED(m4_toupper(COIN_DATA_$1_PATH),["$m4_toupper(COIN_DATA_$1_PATH)"],
    27082708            [Define to absolute path for Data subdirectory $1])
     
    27242724AC_DEFUN([AC_COIN_LINKCOPY_FROM_FILELIST],
    27252725[cmd="$3"
    2726 if test -e $srcdir/$2 ; then
     2726if test -r $srcdir/$2 ; then
    27272727  my_target_dir="$1"
    27282728  my_link_files=`cat $srcdir/$2`
     
    27352735    if test -e $my_target_dir/$i; then : ; else
    27362736      dirn2=`AS_DIRNAME($my_target_dir/$i)`
    2737       if test -e $dirn2; then : ; else
     2737      if test -d $dirn2; then : ; else
    27382738        AS_MKDIR_P($dirn2)
    27392739      fi
     
    32383238  # but it is likely to be either .. (if we are a usual coin project) or ../.. (if we are a unusual coin project like ThirdParty or Data)
    32393239  COIN_PKG_CONFIG_PATH_UNINSTALLED=
    3240   if test -e ../coin_subdirs.txt ; then
     3240  if test -f ../coin_subdirs.txt ; then
    32413241    for i in `cat ../coin_subdirs.txt` ; do
    32423242      if test -d ../$i ; then
     
    32493249  fi
    32503250
    3251   if test -e ../../coin_subdirs.txt ; then
     3251  if test -f ../../coin_subdirs.txt ; then
    32523252    for i in `cat ../../coin_subdirs.txt` ; do
    32533253      if test -d ../../$i ; then
Note: See TracChangeset for help on using the changeset viewer.