Changeset 1461 for ThirdParty/ASL


Ignore:
Timestamp:
Jan 1, 2010 7:15:27 AM (10 years ago)
Author:
stefan
Message:

run amplsolver lib path through cygpath_w before putting it into .pc file

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

Legend:

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

    r1454 r1461  
    104104distcleancheck_listfiles = find . -type f -print
    105105ABSBUILDDIR = @ABSBUILDDIR@
     106ABSPATH_AMPLSOLVER_INSTALLED = @ABSPATH_AMPLSOLVER_INSTALLED@
     107ABSPATH_AMPLSOLVER_UNINSTALLED = @ABSPATH_AMPLSOLVER_UNINSTALLED@
    106108ACLOCAL = @ACLOCAL@
    107109ADDLIBS = @ADDLIBS@
  • ThirdParty/ASL/branches/BSPsplit/asl-uninstalled.pc.in

    r1456 r1461  
    55Description: AMPL Solver Library
    66Version: @PACKAGE_VERSION@
    7 Libs: ${libdir}/@AMPLSOLVER_A@ @ADDLIBS@
     7Libs: @ABSPATH_AMPLSOLVER_UNINSTALLED@ @ADDLIBS@
    88Cflags: -I@ABSBUILDDIR@ -I@abs_source_dir@/solvers
  • ThirdParty/ASL/branches/BSPsplit/asl.pc.in

    r1454 r1461  
    66Description: AMPL Solver Library
    77Version: @PACKAGE_VERSION@
    8 Libs: ${libdir}/@AMPLSOLVER_A@ @ADDLIBS@
     8Libs: @ABSPATH_AMPLSOLVER_INSTALLED@ @ADDLIBS@
    99Cflags: -I${includedir}
  • ThirdParty/ASL/branches/BSPsplit/configure

    r1454 r1461  
    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 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 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 ABSPATH_AMPLSOLVER_INSTALLED ABSPATH_AMPLSOLVER_UNINSTALLED ASLMAKEFLAGS MSVC_COMPILE_TRUE MSVC_COMPILE_FALSE LIBEXT VPATH_DISTCLEANFILES ABSBUILDDIR LIBOBJS LTLIBOBJS'
    476476ac_subst_files=''
    477477
     
    1983819838echo "$as_me: Configuring ASL to build $AMPLSOLVER_A." >&6;}
    1983919839
     19840# Set substitutable variables with the absolute path to the library name
     19841# translate to windows style if necessary, but use slashes instead of backslashes
     19842ABSPATH_AMPLSOLVER_INSTALLED=`${CYGPATH_W} ${prefix}/lib/ThirdParty/${AMPLSOLVER_A} | sed -e 's/\\\\/\\//g'`
     19843curdir=`pwd`
     19844ABSPATH_AMPLSOLVER_UNINSTALLED=`${CYGPATH_W} ${curdir}/${AMPLSOLVER_A} | sed -e 's/\\\\/\\//g'`
     19845
     19846
     19847
    1984019848# Determine flags to be passed on the command line to (n)make. The main
    1984119849# activity is to groom CFLAGS and set up ASLMAKEFLAGS to pass CFLAGS on the
     
    2093020938s,@LT_LDFLAGS@,$LT_LDFLAGS,;t t
    2093120939s,@AMPLSOLVER_A@,$AMPLSOLVER_A,;t t
     20940s,@ABSPATH_AMPLSOLVER_INSTALLED@,$ABSPATH_AMPLSOLVER_INSTALLED,;t t
     20941s,@ABSPATH_AMPLSOLVER_UNINSTALLED@,$ABSPATH_AMPLSOLVER_UNINSTALLED,;t t
    2093220942s,@ASLMAKEFLAGS@,$ASLMAKEFLAGS,;t t
    2093320943s,@MSVC_COMPILE_TRUE@,$MSVC_COMPILE_TRUE,;t t
  • ThirdParty/ASL/branches/BSPsplit/configure.ac

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