Changeset 1456


Ignore:
Timestamp:
Nov 29, 2009 3:54:48 PM (11 years ago)
Author:
stefan
Message:

some fixes; rerun autotools

Location:
ThirdParty
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • ThirdParty/ASL/branches/BSPsplit/asl-uninstalled.pc.in

    r1454 r1456  
    66Version: @PACKAGE_VERSION@
    77Libs: ${libdir}/@AMPLSOLVER_A@ @ADDLIBS@
    8 Cflags: -I@ABSBUILDDIR@ -I@abs_source_dir@
     8Cflags: -I@ABSBUILDDIR@ -I@abs_source_dir@/solvers
  • ThirdParty/All/branches/BSPsplit/configure

    r1447 r1456  
    2102221022    coin_save_PKG_CONFIG_PATH="$PKG_CONFIG_PATH"
    2102321023
     21024    # let's assume that when installing into $prefix, then the user may have installed some other coin projects there before, so it's worth to have a look into there
     21025    if test -d "$prefix"; then
     21026      PKG_CONFIG_PATH="$prefix/lib/ThirdParty/pkgconfig:$PKG_CONFIG_PATH"
     21027    fi
     21028
     21029
    2102421030# Check whether --with-coin-instdir or --without-coin-instdir was given.
    2102521031if test "${with_coin_instdir+set}" = set; then
     
    2115121157    coin_save_PKG_CONFIG_PATH="$PKG_CONFIG_PATH"
    2115221158
     21159    # let's assume that when installing into $prefix, then the user may have installed some other coin projects there before, so it's worth to have a look into there
     21160    if test -d "$prefix"; then
     21161      PKG_CONFIG_PATH="$prefix/lib/ThirdParty/pkgconfig:$PKG_CONFIG_PATH"
     21162    fi
     21163
     21164
    2115321165# Check whether --with-coin-instdir or --without-coin-instdir was given.
    2115421166if test "${with_coin_instdir+set}" = set; then
     
    2128021292    coin_save_PKG_CONFIG_PATH="$PKG_CONFIG_PATH"
    2128121293
     21294    # let's assume that when installing into $prefix, then the user may have installed some other coin projects there before, so it's worth to have a look into there
     21295    if test -d "$prefix"; then
     21296      PKG_CONFIG_PATH="$prefix/lib/ThirdParty/pkgconfig:$PKG_CONFIG_PATH"
     21297    fi
     21298
     21299
    2128221300# Check whether --with-coin-instdir or --without-coin-instdir was given.
    2128321301if test "${with_coin_instdir+set}" = set; then
     
    2140921427    coin_save_PKG_CONFIG_PATH="$PKG_CONFIG_PATH"
    2141021428
     21429    # let's assume that when installing into $prefix, then the user may have installed some other coin projects there before, so it's worth to have a look into there
     21430    if test -d "$prefix"; then
     21431      PKG_CONFIG_PATH="$prefix/lib/ThirdParty/pkgconfig:$PKG_CONFIG_PATH"
     21432    fi
     21433
     21434
    2141121435# Check whether --with-coin-instdir or --without-coin-instdir was given.
    2141221436if test "${with_coin_instdir+set}" = set; then
     
    2153821562    coin_save_PKG_CONFIG_PATH="$PKG_CONFIG_PATH"
    2153921563
     21564    # let's assume that when installing into $prefix, then the user may have installed some other coin projects there before, so it's worth to have a look into there
     21565    if test -d "$prefix"; then
     21566      PKG_CONFIG_PATH="$prefix/lib/ThirdParty/pkgconfig:$PKG_CONFIG_PATH"
     21567    fi
     21568
     21569
    2154021570# Check whether --with-coin-instdir or --without-coin-instdir was given.
    2154121571if test "${with_coin_instdir+set}" = set; then
     
    2166721697    coin_save_PKG_CONFIG_PATH="$PKG_CONFIG_PATH"
    2166821698
     21699    # let's assume that when installing into $prefix, then the user may have installed some other coin projects there before, so it's worth to have a look into there
     21700    if test -d "$prefix"; then
     21701      PKG_CONFIG_PATH="$prefix/lib/ThirdParty/pkgconfig:$PKG_CONFIG_PATH"
     21702    fi
     21703
     21704
    2166921705# Check whether --with-coin-instdir or --without-coin-instdir was given.
    2167021706if test "${with_coin_instdir+set}" = set; then
     
    2179621832    coin_save_PKG_CONFIG_PATH="$PKG_CONFIG_PATH"
    2179721833
     21834    # let's assume that when installing into $prefix, then the user may have installed some other coin projects there before, so it's worth to have a look into there
     21835    if test -d "$prefix"; then
     21836      PKG_CONFIG_PATH="$prefix/lib/ThirdParty/pkgconfig:$PKG_CONFIG_PATH"
     21837    fi
     21838
     21839
    2179821840# Check whether --with-coin-instdir or --without-coin-instdir was given.
    2179921841if test "${with_coin_instdir+set}" = set; then
     
    2192421966  if test -n "$PKG_CONFIG" ; then
    2192521967    coin_save_PKG_CONFIG_PATH="$PKG_CONFIG_PATH"
     21968
     21969    # let's assume that when installing into $prefix, then the user may have installed some other coin projects there before, so it's worth to have a look into there
     21970    if test -d "$prefix"; then
     21971      PKG_CONFIG_PATH="$prefix/lib/ThirdParty/pkgconfig:$PKG_CONFIG_PATH"
     21972    fi
     21973
    2192621974
    2192721975# Check whether --with-coin-instdir or --without-coin-instdir was given.
  • ThirdParty/Mumps/branches/BSPsplit/Makefile.am

    r1436 r1456  
    8888  $(MUMPSDIR)/include/dmumps_c.h \
    8989  $(MUMPSDIR)/include/mumps_compat.h \
    90   $(MUMPSDIR)/include/mumps_c_types.h
     90  $(MUMPSDIR)/include/mumps_c_types.h \
     91  $(MUMPSDIR)/libseq/mpi.h
    9192
    9293addlibsdir = $(prefix)/share/doc/coin/ThirdParty/Mumps
  • ThirdParty/Mumps/branches/BSPsplit/Makefile.in

    r1446 r1456  
    336336  $(MUMPSDIR)/include/dmumps_c.h \
    337337  $(MUMPSDIR)/include/mumps_compat.h \
    338   $(MUMPSDIR)/include/mumps_c_types.h
     338  $(MUMPSDIR)/include/mumps_c_types.h \
     339  $(MUMPSDIR)/libseq/mpi.h
    339340
    340341addlibsdir = $(prefix)/share/doc/coin/ThirdParty/Mumps
     
    707708        $(am__remove_distdir)
    708709        mkdir $(distdir)
    709         $(mkdir_p) $(distdir)/$(MUMPSDIR)/include $(distdir)/. $(distdir)/../../BuildTools
     710        $(mkdir_p) $(distdir)/$(MUMPSDIR)/include $(distdir)/$(MUMPSDIR)/libseq $(distdir)/. $(distdir)/../../BuildTools
    710711        @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
    711712        topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
Note: See TracChangeset for help on using the changeset viewer.