Changeset 569 for branches/devel/Cbc


Ignore:
Timestamp:
Mar 8, 2007 12:30:17 PM (12 years ago)
Author:
forrest
Message:

try and fix ampl (i.e. take out Andreas stuff of a week ago)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/devel/Cbc/configure

    r547 r569  
    2182221822
    2182321823if test "$use_asldir" = BUILD; then
    21824   if test "$PACKAGE_NAME" != ThirdPartyASL; then
    21825     # If we are configuring ThirdParty/ASL, don't check
    21826     as_ac_File=`echo "ac_cv_file_$coin_aslobjdir/.MakeOk" | $as_tr_sh`
    21827 echo "$as_me:$LINENO: checking for $coin_aslobjdir/.MakeOk" >&5
    21828 echo $ECHO_N "checking for $coin_aslobjdir/.MakeOk... $ECHO_C" >&6
     21824  as_ac_File=`echo "ac_cv_file_$coin_aslobjdir/Makefile" | $as_tr_sh`
     21825echo "$as_me:$LINENO: checking for $coin_aslobjdir/Makefile" >&5
     21826echo $ECHO_N "checking for $coin_aslobjdir/Makefile... $ECHO_C" >&6
    2182921827if eval "test \"\${$as_ac_File+set}\" = set"; then
    2183021828  echo $ECHO_N "(cached) $ECHO_C" >&6
     
    2183421832echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
    2183521833   { (exit 1); exit 1; }; }
    21836 if test -r "$coin_aslobjdir/.MakeOk"; then
     21834if test -r "$coin_aslobjdir/Makefile"; then
    2183721835  eval "$as_ac_File=yes"
    2183821836else
     
    2185021848fi
    2185121849
    21852   fi
    2185321850elif test -z "$use_asldir"; then
    2185421851 # try to find sources - if not given don't compile
    21855   if test "$PACKAGE_NAME" != ThirdPartyASL; then
    21856     as_ac_File=`echo "ac_cv_file_$coin_aslobjdir/.MakeOk" | $as_tr_sh`
    21857 echo "$as_me:$LINENO: checking for $coin_aslobjdir/.MakeOk" >&5
    21858 echo $ECHO_N "checking for $coin_aslobjdir/.MakeOk... $ECHO_C" >&6
     21852  as_ac_File=`echo "ac_cv_file_$coin_aslobjdir/Makefile" | $as_tr_sh`
     21853echo "$as_me:$LINENO: checking for $coin_aslobjdir/Makefile" >&5
     21854echo $ECHO_N "checking for $coin_aslobjdir/Makefile... $ECHO_C" >&6
    2185921855if eval "test \"\${$as_ac_File+set}\" = set"; then
    2186021856  echo $ECHO_N "(cached) $ECHO_C" >&6
     
    2186421860echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
    2186521861   { (exit 1); exit 1; }; }
    21866 if test -r "$coin_aslobjdir/.MakeOk"; then
     21862if test -r "$coin_aslobjdir/Makefile"; then
    2186721863  eval "$as_ac_File=yes"
    2186821864else
     
    2187821874fi
    2187921875
    21880   else
    21881     use_asldir=no
    21882   fi
    2188321876elif test "$use_asldir" != "no"; then
    2188421877  as_ac_File=`echo "ac_cv_file_$use_asldir/$ampllib" | $as_tr_sh`
     
    2210522098# Finally, we let configure write all the output...
    2210622099
    22107 if test x$coin_skip_ac_output != xyes; then
    22108 
    22109   FADDLIBS="$ADDLIBS"
    22110   if test x"$coin_need_flibs" = xyes; then
    22111     ADDLIBS="$ADDLIBS $FLIBS"
    22112   fi
    22113 
    22114   # library extension
    22115 
    22116   case "$CC" in
    22117     cl* | */cl* | CL* | */CL*)
    22118          LIBEXT=lib ;;
    22119       *) LIBEXT=a ;;
    22120   esac
    22121 
    22122   # Define VPATH_DISTCLEANFILES to be everything that needs to be
    22123   # cleaned for distclean in a vpath configuration
    22124 
    22125   VPATH_DISTCLEANFILES="$coin_vpath_link_files"
    22126 
    22127   # Take out subdirectories if their configuration concluded that they
    22128   # don't need to be compiled
    22129   if test x"$coin_ac_skip_subdirs" != x; then
    22130     new_subdirs=
    22131     for i in $subdirs; do
    22132       skipme=no
    22133       for j in $coin_ac_skip_subdirs; do
    22134         if test $i = $j; then
    22135           skipme=yes;
    22136         fi
    22137       done
    22138       if test $skipme = no; then
    22139         new_subdirs="$new_subdirs $i"
    22140       fi
    22141     done
    22142     subdirs="$new_subdirs"
    22143   fi
    22144 
    22145   cat >confcache <<\_ACEOF
     22100FADDLIBS="$ADDLIBS"
     22101if test x"$coin_need_flibs" = xyes; then
     22102  ADDLIBS="$ADDLIBS $FLIBS"
     22103fi
     22104
     22105# library extension
     22106
     22107case "$CC" in
     22108  cl* | */cl* | CL* | */CL*)
     22109       LIBEXT=lib ;;
     22110    *) LIBEXT=a ;;
     22111esac
     22112
     22113# Define VPATH_DISTCLEANFILES to be everything that needs to be
     22114# cleaned for distclean in a vpath configuration
     22115
     22116VPATH_DISTCLEANFILES="$coin_vpath_link_files"
     22117
     22118cat >confcache <<\_ACEOF
    2214622119# This file is a shell script that caches the results of configure
    2214722120# tests run on this system so they can be shared between configure
     
    2380623779
    2380723780
    23808   if test x"$coin_vpath_link_files" = x; then : ; else
    23809     lnkcmd=
    23810     if test "$enable_doscompile" = yes; then
    23811       lnkcmd=cp
    23812     fi
    23813     case "$CC" in
    23814       cl* | */cl* | CL* | */CL*)
    23815         lnkcmd=cp ;;
    23816     esac
    23817     if test "$lnkcmd" = cp; then
    23818       { echo "$as_me:$LINENO: Copying data files for VPATH configuration" >&5
     23781if test x"$coin_vpath_link_files" = x; then : ; else
     23782  lnkcmd=
     23783  if test "$enable_doscompile" = yes; then
     23784    lnkcmd=cp
     23785  fi
     23786  case "$CC" in
     23787    cl* | */cl* | CL* | */CL*)
     23788      lnkcmd=cp ;;
     23789  esac
     23790  if test "$lnkcmd" = cp; then
     23791    { echo "$as_me:$LINENO: Copying data files for VPATH configuration" >&5
    2381923792echo "$as_me: Copying data files for VPATH configuration" >&6;}
    23820     else
    23821       echo "$as_me:$LINENO: checking whether ln -s works" >&5
     23793  else
     23794    echo "$as_me:$LINENO: checking whether ln -s works" >&5
    2382223795echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6
    2382323796LN_S=$as_ln_s
     
    2383023803fi
    2383123804
    23832       { echo "$as_me:$LINENO: Creating VPATH links for data files" >&5
     23805    { echo "$as_me:$LINENO: Creating VPATH links for data files" >&5
    2383323806echo "$as_me: Creating VPATH links for data files" >&6;}
    23834       lnkcmd="$LN_S"
    23835     fi
    23836     for file in $coin_vpath_link_files; do
    23837       dir=`(dirname "./$file") 2>/dev/null ||
     23807    lnkcmd="$LN_S"
     23808  fi
     23809  for file in $coin_vpath_link_files; do
     23810    dir=`(dirname "./$file") 2>/dev/null ||
    2383823811$as_expr X"./$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
    2383923812         X"./$file" : 'X\(//\)[^/]' \| \
     
    2384723820          /^X\(\/\).*/{ s//\1/; q; }
    2384823821          s/.*/./; q'`
    23849       if test -d $dir; then : ; else
    23850         { if $as_mkdir_p; then
     23822    if test -d $dir; then : ; else
     23823      { if $as_mkdir_p; then
    2385123824    mkdir -p $dir
    2385223825  else
     
    2387323846   { (exit 1); exit 1; }; }; }
    2387423847
    23875       fi
    23876       rm -f $file
    23877       $lnkcmd $abs_source_dir/$file $file
    23878     done
    23879   fi
    23880 
    23881   if test x$coin_projectdir = xyes; then
    23882     { echo "$as_me:$LINENO: Configuration of $PACKAGE_NAME successful" >&5
     23848    fi
     23849    rm -f $file
     23850    $lnkcmd $abs_source_dir/$file $file
     23851  done
     23852fi
     23853
     23854if test x$coin_projectdir = xyes; then
     23855  { echo "$as_me:$LINENO: Configuration of $PACKAGE_NAME successful" >&5
    2388323856echo "$as_me: Configuration of $PACKAGE_NAME successful" >&6;}
    23884   else
    23885     { echo "$as_me:$LINENO: Main configuration of $PACKAGE_NAME successful" >&5
     23857else
     23858  { echo "$as_me:$LINENO: Main configuration of $PACKAGE_NAME successful" >&5
    2388623859echo "$as_me: Main configuration of $PACKAGE_NAME successful" >&6;}
    23887   fi
    23888 else
    23889   { echo "$as_me:$LINENO: No configuration of $PACKAGE_NAME necessary" >&5
    23890 echo "$as_me: No configuration of $PACKAGE_NAME necessary" >&6;}
    23891 fi
    23892 
    23893 
     23860fi
     23861
Note: See TracChangeset for help on using the changeset viewer.