Changeset 1872 for ThirdParty/ASL


Ignore:
Timestamp:
Nov 25, 2010 5:09:19 PM (9 years ago)
Author:
stefan
Message:

do not need ABSPATH_AMPLSOLVER* anymore

Location:
ThirdParty/ASL/trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • ThirdParty/ASL/trunk/Makefile.in

    r1678 r1872  
    101101distcleancheck_listfiles = find . -type f -print
    102102ABSBUILDDIR = @ABSBUILDDIR@
    103 ABSPATH_AMPLSOLVER_INSTALLED = @ABSPATH_AMPLSOLVER_INSTALLED@
    104 ABSPATH_AMPLSOLVER_UNINSTALLED = @ABSPATH_AMPLSOLVER_UNINSTALLED@
    105103ACLOCAL = @ACLOCAL@
    106104ADDLIBS = @ADDLIBS@
  • ThirdParty/ASL/trunk/configure

    r1871 r1872  
    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 PCADDLIBS FADDLIBS ALWAYS_FALSE_TRUE ALWAYS_FALSE_FALSE have_svnversion ASL_SVN_REV 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 PKG_CONFIG ac_pt_PKG_CONFIG COIN_HAS_PKGCONFIG_TRUE COIN_HAS_PKGCONFIG_FALSE COIN_PKG_CONFIG_PATH COIN_PKG_CONFIG_PATH_UNINSTALLED AMPLSOLVER_A ABSPATH_AMPLSOLVER_INSTALLED ABSPATH_AMPLSOLVER_UNINSTALLED ASLMAKEFLAGS MSVC_COMPILE_TRUE MSVC_COMPILE_FALSE ASL_PCLIBS LIBEXT VPATH_DISTCLEANFILES ABSBUILDDIR 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 PCADDLIBS FADDLIBS ALWAYS_FALSE_TRUE ALWAYS_FALSE_FALSE have_svnversion ASL_SVN_REV 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 PKG_CONFIG ac_pt_PKG_CONFIG COIN_HAS_PKGCONFIG_TRUE COIN_HAS_PKGCONFIG_FALSE COIN_PKG_CONFIG_PATH COIN_PKG_CONFIG_PATH_UNINSTALLED AMPLSOLVER_A ASLMAKEFLAGS MSVC_COMPILE_TRUE MSVC_COMPILE_FALSE ASL_PCLIBS LIBEXT VPATH_DISTCLEANFILES ABSBUILDDIR LIBOBJS LTLIBOBJS'
    476476ac_subst_files=''
    477477
     
    2009720097case "$CC" in
    2009820098  cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
    20099     AMPLSOLVER_A=libamplsolv.lib
     20099    AMPLSOLVER_A=libamplsolver.lib
    2010020100    msvc_compile=yes
    2010120101    ;;
     
    2010720107{ echo "$as_me:$LINENO: Configuring ASL to build $AMPLSOLVER_A." >&5
    2010820108echo "$as_me: Configuring ASL to build $AMPLSOLVER_A." >&6;}
    20109 
    20110 # Set substitutable variables with the absolute path to the library name
    20111 # translate to windows style if necessary, but use slashes instead of backslashes
    20112 ABSPATH_AMPLSOLVER_INSTALLED=`${CYGPATH_W} ${prefix}/lib/coin/ThirdParty/${AMPLSOLVER_A} | sed -e 's/\\\\/\\//g'`
    20113 curdir=`pwd`
    20114 ABSPATH_AMPLSOLVER_UNINSTALLED=`${CYGPATH_W} ${curdir}/${AMPLSOLVER_A} | sed -e 's/\\\\/\\//g'`
    20115 
    20116 
    2011720109
    2011820110# Determine flags to be passed on the command line to (n)make. The main
     
    2124021232s,@COIN_PKG_CONFIG_PATH_UNINSTALLED@,$COIN_PKG_CONFIG_PATH_UNINSTALLED,;t t
    2124121233s,@AMPLSOLVER_A@,$AMPLSOLVER_A,;t t
    21242 s,@ABSPATH_AMPLSOLVER_INSTALLED@,$ABSPATH_AMPLSOLVER_INSTALLED,;t t
    21243 s,@ABSPATH_AMPLSOLVER_UNINSTALLED@,$ABSPATH_AMPLSOLVER_UNINSTALLED,;t t
    2124421234s,@ASLMAKEFLAGS@,$ASLMAKEFLAGS,;t t
    2124521235s,@MSVC_COMPILE_TRUE@,$MSVC_COMPILE_TRUE,;t t
  • ThirdParty/ASL/trunk/configure.ac

    r1871 r1872  
    8181esac
    8282AC_MSG_NOTICE([Configuring ASL to build $AMPLSOLVER_A.])
    83 
    84 # Set substitutable variables with the absolute path to the library name
    85 # translate to windows style if necessary, but use slashes instead of backslashes
    86 ABSPATH_AMPLSOLVER_INSTALLED=`${CYGPATH_W} ${prefix}/lib/coin/ThirdParty/${AMPLSOLVER_A} | sed -e 's/\\\\/\\//g'`
    87 curdir=`pwd`
    88 ABSPATH_AMPLSOLVER_UNINSTALLED=`${CYGPATH_W} ${curdir}/${AMPLSOLVER_A} | sed -e 's/\\\\/\\//g'`
    89 AC_SUBST(ABSPATH_AMPLSOLVER_INSTALLED)
    90 AC_SUBST(ABSPATH_AMPLSOLVER_UNINSTALLED)
    9183
    9284# Determine flags to be passed on the command line to (n)make. The main
Note: See TracChangeset for help on using the changeset viewer.