Changeset 1446 for ThirdParty/ASL


Ignore:
Timestamp:
Nov 22, 2009 1:47:29 PM (10 years ago)
Author:
stefan
Message:

stop using COIN_HAS_PROJECT; some cleanup; use MODULE_BLAS in Mumps

Location:
ThirdParty/ASL/branches/BSPsplit
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • ThirdParty/ASL/branches/BSPsplit/Makefile.in

    r1388 r1446  
    9999distuninstallcheck_listfiles = find . -type f -print
    100100distcleancheck_listfiles = find . -type f -print
     101ABSBUILDDIR = @ABSBUILDDIR@
    101102ACLOCAL = @ACLOCAL@
    102103ADDLIBS = @ADDLIBS@
  • ThirdParty/ASL/branches/BSPsplit/configure

    r1437 r1446  
    473473#endif"
    474474
    475 ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os ADDLIBS FADDLIBS ALWAYS_FALSE_TRUE ALWAYS_FALSE_FALSE EGREP LN_S CDEFS ADD_CFLAGS DBG_CFLAGS OPT_CFLAGS sol_cc_compiler CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT MPICC INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LIBTOOLM4 have_autoconf have_automake have_svn BUILDTOOLSDIR AUX_DIR abs_source_dir abs_lib_dir abs_include_dir abs_bin_dir HAVE_EXTERNALS_TRUE HAVE_EXTERNALS_FALSE host host_cpu host_vendor host_os ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL ac_c_preproc_warn_flag ac_cxx_preproc_warn_flag RPATH_FLAGS LT_LDFLAGS AMPLSOLVER_A ASLMAKEFLAGS MSVC_COMPILE_TRUE MSVC_COMPILE_FALSE LIBEXT VPATH_DISTCLEANFILES LIBOBJS LTLIBOBJS'
     475ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os ADDLIBS FADDLIBS ALWAYS_FALSE_TRUE ALWAYS_FALSE_FALSE EGREP LN_S CDEFS ADD_CFLAGS DBG_CFLAGS OPT_CFLAGS sol_cc_compiler CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT MPICC INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LIBTOOLM4 have_autoconf have_automake have_svn BUILDTOOLSDIR AUX_DIR abs_source_dir abs_lib_dir abs_include_dir abs_bin_dir HAVE_EXTERNALS_TRUE HAVE_EXTERNALS_FALSE host host_cpu host_vendor host_os ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL ac_c_preproc_warn_flag ac_cxx_preproc_warn_flag RPATH_FLAGS LT_LDFLAGS AMPLSOLVER_A ASLMAKEFLAGS MSVC_COMPILE_TRUE MSVC_COMPILE_FALSE LIBEXT VPATH_DISTCLEANFILES ABSBUILDDIR LIBOBJS LTLIBOBJS'
    476476ac_subst_files=''
    477477
     
    1982919829
    1983019830
    19831 #MAKEOKFILE=.MakeOk
    19832 #if test $coin_has_asl != no && test "$use_asldir" != BUILD; then
    19833 #  skip_further_test=yes
    19834 #  rm -f $MAKEOKFILE
    19835 #  AC_MSG_NOTICE([The ASL sources don't need to be compiled])
    19836 #  MAKEOKFILE=
    19837 #else
    19838 #  touch $MAKEOKFILE
    19839 #fi
    19840 #AC_SUBST(MAKEOKFILE)
    19841 #AM_CONDITIONAL(SKIPMAKE, test -z "$MAKEOKFILE")
    19842 
    1984319831#############################################################################
    1984419832#                          AMPL SOLVER LIBRARY                              #
     
    2015220140    done
    2015320141    subdirs="$new_subdirs"
     20142  fi
     20143
     20144  # need to come before AC_OUTPUT
     20145  if test x$coin_projectdir != xyes; then
     20146    # write coin_subdirs to a file so that project configuration knows where to find uninstalled projects
     20147    echo $coin_subdirs > coin_subdirs.txt
     20148  else
     20149    # substitute for OBJDIR, needed to setup .pc file for uninstalled project
     20150    ABSBUILDDIR="`pwd`"
     20151
    2015420152  fi
    2015520153
     
    2095320951s,@LIBEXT@,$LIBEXT,;t t
    2095420952s,@VPATH_DISTCLEANFILES@,$VPATH_DISTCLEANFILES,;t t
     20953s,@ABSBUILDDIR@,$ABSBUILDDIR,;t t
    2095520954s,@LIBOBJS@,$LIBOBJS,;t t
    2095620955s,@LTLIBOBJS@,$LTLIBOBJS,;t t
  • ThirdParty/ASL/branches/BSPsplit/configure.ac

    r1388 r1446  
    7070esac
    7171
    72 
    73 #MAKEOKFILE=.MakeOk
    74 #if test $coin_has_asl != no && test "$use_asldir" != BUILD; then
    75 #  skip_further_test=yes
    76 #  rm -f $MAKEOKFILE
    77 #  AC_MSG_NOTICE([The ASL sources don't need to be compiled])
    78 #  MAKEOKFILE=
    79 #else
    80 #  touch $MAKEOKFILE
    81 #fi
    82 #AC_SUBST(MAKEOKFILE)
    83 #AM_CONDITIONAL(SKIPMAKE, test -z "$MAKEOKFILE")
    8472
    8573#############################################################################
Note: See TracChangeset for help on using the changeset viewer.