Ignore:
Timestamp:
Feb 6, 2010 3:15:20 PM (10 years ago)
Author:
stefan
Message:

install libs and doc to different location; names of pc files for data and thirdparty projects changed

File:
1 edited

Legend:

Unmodified
Added
Removed
  • stable/BSPsplit/configure

    r1467 r1510  
    2096920969
    2097020970coin_has_blas=notGiven
     20971coin_have_project_dir=no
    2097120972
    2097220973# check if user wants to skip project in any case
     
    2098620987  if test $PACKAGE_TARNAME = blas; then
    2098720988    coin_has_blas=.
     20989    coin_have_project_dir=yes
    2098820990  fi
    2098920991
     
    2101821020    # 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
    2101921021    if test -d "$prefix"; then
    21020       PKG_CONFIG_PATH="$prefix/lib/ThirdParty/pkgconfig:$PKG_CONFIG_PATH"
     21022      PKG_CONFIG_PATH="$prefix/lib/pkgconfig:$PKG_CONFIG_PATH"
    2102121023    fi
    2102221024
     
    2103021032   { (exit 1); exit 1; }; }
    2103121033       fi
    21032        PKG_CONFIG_PATH="$withval/lib/ThirdParty/pkgconfig:$PKG_CONFIG_PATH"
     21034       PKG_CONFIG_PATH="$withval/lib/pkgconfig:$PKG_CONFIG_PATH"
    2103321035
    2103421036fi;
     
    2103921041
    2104021042if test -n "$PKG_CONFIG" ; then
    21041   if $PKG_CONFIG --exists "blas"; then
    21042     BLAS_VERSION=`$PKG_CONFIG --modversion "blas" 2>/dev/null`
    21043     coin_has_blas="$BLAS_VERSION"
     21043  if $PKG_CONFIG --exists "coinblas"; then
     21044    COINBLAS_VERSION=`$PKG_CONFIG --modversion "coinblas" 2>/dev/null`
     21045    coin_has_blas="$COINBLAS_VERSION"
    2104421046  else
    21045     BLAS_PKG_ERRORS=`$PKG_CONFIG $pkg_short_errors --errors-to-stdout --print-errors "blas"`
    21046 
    21047   fi
    21048 else
    21049   { { echo "$as_me:$LINENO: error: \"Cannot check for existance of module Blas without pkg-config\"" >&5
    21050 echo "$as_me: error: \"Cannot check for existance of module Blas without pkg-config\"" >&2;}
     21047    COINBLAS_PKG_ERRORS=`$PKG_CONFIG $pkg_short_errors --errors-to-stdout --print-errors "coinblas"`
     21048
     21049  fi
     21050else
     21051  { { echo "$as_me:$LINENO: error: \"Cannot check for existance of module coinblas without pkg-config\"" >&5
     21052echo "$as_me: error: \"Cannot check for existance of module coinblas without pkg-config\"" >&2;}
    2105121053   { (exit 1); exit 1; }; }
    2105221054fi
     
    2106021062if test "$coin_has_blas" = notGiven; then
    2106121063  if test -d $srcdir/ThirdParty/Blas; then
    21062     coin_pkg_is_here=no
    2106321064    for i in $srcdir/ThirdParty/Blas/daxpy.f; do
    2106421065         if test -r $i; then
    21065            coin_pkg_is_here=yes
     21066           coin_have_project_dir=yes
    2106621067         fi
    2106721068       done
    2106821069
    21069     if test $coin_pkg_is_here = yes; then
     21070    if test $coin_have_project_dir = yes; then
    2107021071      coin_has_blas=ThirdParty/Blas
    2107121072    fi
     
    2107821079echo "$as_me:$LINENO: checking whether project Blas need to be configured" >&5
    2107921080echo $ECHO_N "checking whether project Blas need to be configured... $ECHO_C" >&6
    21080 if test "$coin_has_blas" != skipping &&
    21081    test "$coin_has_blas" != notGiven &&
    21082    test "$coin_has_blas" != installed; then
     21081if test "$coin_have_project_dir" = yes ; then
    2108321082
    2108421083  if test -r $srcdir/ThirdParty/Blas/configure; then
     
    2110421103
    2110521104coin_has_lapack=notGiven
     21105coin_have_project_dir=no
    2110621106
    2110721107# check if user wants to skip project in any case
     
    2112121121  if test $PACKAGE_TARNAME = lapack; then
    2112221122    coin_has_lapack=.
     21123    coin_have_project_dir=yes
    2112321124  fi
    2112421125
     
    2115321154    # 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
    2115421155    if test -d "$prefix"; then
    21155       PKG_CONFIG_PATH="$prefix/lib/ThirdParty/pkgconfig:$PKG_CONFIG_PATH"
     21156      PKG_CONFIG_PATH="$prefix/lib/pkgconfig:$PKG_CONFIG_PATH"
    2115621157    fi
    2115721158
     
    2116521166   { (exit 1); exit 1; }; }
    2116621167       fi
    21167        PKG_CONFIG_PATH="$withval/lib/ThirdParty/pkgconfig:$PKG_CONFIG_PATH"
     21168       PKG_CONFIG_PATH="$withval/lib/pkgconfig:$PKG_CONFIG_PATH"
    2116821169
    2116921170fi;
     
    2117421175
    2117521176if test -n "$PKG_CONFIG" ; then
    21176   if $PKG_CONFIG --exists "lapack"; then
    21177     LAPACK_VERSION=`$PKG_CONFIG --modversion "lapack" 2>/dev/null`
    21178     coin_has_lapack="$LAPACK_VERSION"
     21177  if $PKG_CONFIG --exists "coinlapack"; then
     21178    COINLAPACK_VERSION=`$PKG_CONFIG --modversion "coinlapack" 2>/dev/null`
     21179    coin_has_lapack="$COINLAPACK_VERSION"
    2117921180  else
    21180     LAPACK_PKG_ERRORS=`$PKG_CONFIG $pkg_short_errors --errors-to-stdout --print-errors "lapack"`
    21181 
    21182   fi
    21183 else
    21184   { { echo "$as_me:$LINENO: error: \"Cannot check for existance of module Lapack without pkg-config\"" >&5
    21185 echo "$as_me: error: \"Cannot check for existance of module Lapack without pkg-config\"" >&2;}
     21181    COINLAPACK_PKG_ERRORS=`$PKG_CONFIG $pkg_short_errors --errors-to-stdout --print-errors "coinlapack"`
     21182
     21183  fi
     21184else
     21185  { { echo "$as_me:$LINENO: error: \"Cannot check for existance of module coinlapack without pkg-config\"" >&5
     21186echo "$as_me: error: \"Cannot check for existance of module coinlapack without pkg-config\"" >&2;}
    2118621187   { (exit 1); exit 1; }; }
    2118721188fi
     
    2119521196if test "$coin_has_lapack" = notGiven; then
    2119621197  if test -d $srcdir/ThirdParty/Lapack; then
    21197     coin_pkg_is_here=no
    2119821198    for i in $srcdir/ThirdParty/Lapack/LAPACK/SRC/dlarf.f; do
    2119921199         if test -r $i; then
    21200            coin_pkg_is_here=yes
     21200           coin_have_project_dir=yes
    2120121201         fi
    2120221202       done
    2120321203
    21204     if test $coin_pkg_is_here = yes; then
     21204    if test $coin_have_project_dir = yes; then
    2120521205      coin_has_lapack=ThirdParty/Lapack
    2120621206    fi
     
    2121321213echo "$as_me:$LINENO: checking whether project Lapack need to be configured" >&5
    2121421214echo $ECHO_N "checking whether project Lapack need to be configured... $ECHO_C" >&6
    21215 if test "$coin_has_lapack" != skipping &&
    21216    test "$coin_has_lapack" != notGiven &&
    21217    test "$coin_has_lapack" != installed; then
     21215if test "$coin_have_project_dir" = yes ; then
    2121821216
    2121921217  if test -r $srcdir/ThirdParty/Lapack/configure; then
     
    2123921237
    2124021238coin_has_sample=notGiven
     21239coin_have_project_dir=no
    2124121240
    2124221241# check if user wants to skip project in any case
     
    2125621255  if test $PACKAGE_TARNAME = sample; then
    2125721256    coin_has_sample=.
     21257    coin_have_project_dir=yes
    2125821258  fi
    2125921259
     
    2128821288    # 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
    2128921289    if test -d "$prefix"; then
    21290       PKG_CONFIG_PATH="$prefix/lib/Data/pkgconfig:$PKG_CONFIG_PATH"
     21290      PKG_CONFIG_PATH="$prefix/lib/pkgconfig:$PKG_CONFIG_PATH"
    2129121291    fi
    2129221292
     
    2130021300   { (exit 1); exit 1; }; }
    2130121301       fi
    21302        PKG_CONFIG_PATH="$withval/lib/Data/pkgconfig:$PKG_CONFIG_PATH"
     21302       PKG_CONFIG_PATH="$withval/lib/pkgconfig:$PKG_CONFIG_PATH"
    2130321303
    2130421304fi;
     
    2130921309
    2131021310if test -n "$PKG_CONFIG" ; then
    21311   if $PKG_CONFIG --exists "sample"; then
    21312     SAMPLE_VERSION=`$PKG_CONFIG --modversion "sample" 2>/dev/null`
    21313     coin_has_sample="$SAMPLE_VERSION"
     21311  if $PKG_CONFIG --exists "coindatasample"; then
     21312    COINDATASAMPLE_VERSION=`$PKG_CONFIG --modversion "coindatasample" 2>/dev/null`
     21313    coin_has_sample="$COINDATASAMPLE_VERSION"
    2131421314  else
    21315     SAMPLE_PKG_ERRORS=`$PKG_CONFIG $pkg_short_errors --errors-to-stdout --print-errors "sample"`
    21316 
    21317   fi
    21318 else
    21319   { { echo "$as_me:$LINENO: error: \"Cannot check for existance of module Sample without pkg-config\"" >&5
    21320 echo "$as_me: error: \"Cannot check for existance of module Sample without pkg-config\"" >&2;}
     21315    COINDATASAMPLE_PKG_ERRORS=`$PKG_CONFIG $pkg_short_errors --errors-to-stdout --print-errors "coindatasample"`
     21316
     21317  fi
     21318else
     21319  { { echo "$as_me:$LINENO: error: \"Cannot check for existance of module coindatasample without pkg-config\"" >&5
     21320echo "$as_me: error: \"Cannot check for existance of module coindatasample without pkg-config\"" >&2;}
    2132121321   { (exit 1); exit 1; }; }
    2132221322fi
     
    2133021330if test "$coin_has_sample" = notGiven; then
    2133121331  if test -d $srcdir/Data/Sample; then
    21332     coin_pkg_is_here=no
    21333      coin_pkg_is_here=yes
    21334 
    21335     if test $coin_pkg_is_here = yes; then
     21332     coin_have_project_dir=yes
     21333
     21334    if test $coin_have_project_dir = yes; then
    2133621335      coin_has_sample=Data/Sample
    2133721336    fi
     
    2134421343echo "$as_me:$LINENO: checking whether project Sample need to be configured" >&5
    2134521344echo $ECHO_N "checking whether project Sample need to be configured... $ECHO_C" >&6
    21346 if test "$coin_has_sample" != skipping &&
    21347    test "$coin_has_sample" != notGiven &&
    21348    test "$coin_has_sample" != installed; then
     21345if test "$coin_have_project_dir" = yes ; then
    2134921346
    2135021347  if test -r $srcdir/Data/Sample/configure; then
     
    2137021367
    2137121368coin_has_netlib=notGiven
     21369coin_have_project_dir=no
    2137221370
    2137321371# check if user wants to skip project in any case
     
    2138721385  if test $PACKAGE_TARNAME = netlib; then
    2138821386    coin_has_netlib=.
     21387    coin_have_project_dir=yes
    2138921388  fi
    2139021389
     
    2141921418    # 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
    2142021419    if test -d "$prefix"; then
    21421       PKG_CONFIG_PATH="$prefix/lib/Data/pkgconfig:$PKG_CONFIG_PATH"
     21420      PKG_CONFIG_PATH="$prefix/lib/pkgconfig:$PKG_CONFIG_PATH"
    2142221421    fi
    2142321422
     
    2143121430   { (exit 1); exit 1; }; }
    2143221431       fi
    21433        PKG_CONFIG_PATH="$withval/lib/Data/pkgconfig:$PKG_CONFIG_PATH"
     21432       PKG_CONFIG_PATH="$withval/lib/pkgconfig:$PKG_CONFIG_PATH"
    2143421433
    2143521434fi;
     
    2144021439
    2144121440if test -n "$PKG_CONFIG" ; then
    21442   if $PKG_CONFIG --exists "netlib"; then
    21443     NETLIB_VERSION=`$PKG_CONFIG --modversion "netlib" 2>/dev/null`
    21444     coin_has_netlib="$NETLIB_VERSION"
     21441  if $PKG_CONFIG --exists "coindatanetlib"; then
     21442    COINDATANETLIB_VERSION=`$PKG_CONFIG --modversion "coindatanetlib" 2>/dev/null`
     21443    coin_has_netlib="$COINDATANETLIB_VERSION"
    2144521444  else
    21446     NETLIB_PKG_ERRORS=`$PKG_CONFIG $pkg_short_errors --errors-to-stdout --print-errors "netlib"`
    21447 
    21448   fi
    21449 else
    21450   { { echo "$as_me:$LINENO: error: \"Cannot check for existance of module Netlib without pkg-config\"" >&5
    21451 echo "$as_me: error: \"Cannot check for existance of module Netlib without pkg-config\"" >&2;}
     21445    COINDATANETLIB_PKG_ERRORS=`$PKG_CONFIG $pkg_short_errors --errors-to-stdout --print-errors "coindatanetlib"`
     21446
     21447  fi
     21448else
     21449  { { echo "$as_me:$LINENO: error: \"Cannot check for existance of module coindatanetlib without pkg-config\"" >&5
     21450echo "$as_me: error: \"Cannot check for existance of module coindatanetlib without pkg-config\"" >&2;}
    2145221451   { (exit 1); exit 1; }; }
    2145321452fi
     
    2146121460if test "$coin_has_netlib" = notGiven; then
    2146221461  if test -d $srcdir/Data/Netlib; then
    21463     coin_pkg_is_here=no
    21464      coin_pkg_is_here=yes
    21465 
    21466     if test $coin_pkg_is_here = yes; then
     21462     coin_have_project_dir=yes
     21463
     21464    if test $coin_have_project_dir = yes; then
    2146721465      coin_has_netlib=Data/Netlib
    2146821466    fi
     
    2147521473echo "$as_me:$LINENO: checking whether project Netlib need to be configured" >&5
    2147621474echo $ECHO_N "checking whether project Netlib need to be configured... $ECHO_C" >&6
    21477 if test "$coin_has_netlib" != skipping &&
    21478    test "$coin_has_netlib" != notGiven &&
    21479    test "$coin_has_netlib" != installed; then
     21475if test "$coin_have_project_dir" = yes ; then
    2148021476
    2148121477  if test -r $srcdir/Data/Netlib/configure; then
     
    2150121497
    2150221498coin_has_coinutils=notGiven
     21499coin_have_project_dir=no
    2150321500
    2150421501# check if user wants to skip project in any case
     
    2151821515  if test $PACKAGE_TARNAME = coinutils; then
    2151921516    coin_has_coinutils=.
     21517    coin_have_project_dir=yes
    2152021518  fi
    2152121519
     
    2155021548    # 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
    2155121549    if test -d "$prefix"; then
    21552       PKG_CONFIG_PATH="$prefix/lib//pkgconfig:$PKG_CONFIG_PATH"
     21550      PKG_CONFIG_PATH="$prefix/lib/pkgconfig:$PKG_CONFIG_PATH"
    2155321551    fi
    2155421552
     
    2156221560   { (exit 1); exit 1; }; }
    2156321561       fi
    21564        PKG_CONFIG_PATH="$withval/lib//pkgconfig:$PKG_CONFIG_PATH"
     21562       PKG_CONFIG_PATH="$withval/lib/pkgconfig:$PKG_CONFIG_PATH"
    2156521563
    2156621564fi;
     
    2159221590if test "$coin_has_coinutils" = notGiven; then
    2159321591  if test -d $srcdir//CoinUtils; then
    21594     coin_pkg_is_here=no
    21595      coin_pkg_is_here=yes
    21596 
    21597     if test $coin_pkg_is_here = yes; then
     21592     coin_have_project_dir=yes
     21593
     21594    if test $coin_have_project_dir = yes; then
    2159821595      coin_has_coinutils=/CoinUtils
    2159921596    fi
     
    2160621603echo "$as_me:$LINENO: checking whether project CoinUtils need to be configured" >&5
    2160721604echo $ECHO_N "checking whether project CoinUtils need to be configured... $ECHO_C" >&6
    21608 if test "$coin_has_coinutils" != skipping &&
    21609    test "$coin_has_coinutils" != notGiven &&
    21610    test "$coin_has_coinutils" != installed; then
     21605if test "$coin_have_project_dir" = yes ; then
    2161121606
    2161221607  if test -r $srcdir//CoinUtils/configure; then
     
    2163221627
    2163321628coin_has_clp=notGiven
     21629coin_have_project_dir=no
    2163421630
    2163521631# check if user wants to skip project in any case
     
    2164921645  if test $PACKAGE_TARNAME = clp; then
    2165021646    coin_has_clp=.
     21647    coin_have_project_dir=yes
    2165121648  fi
    2165221649
     
    2168121678    # 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
    2168221679    if test -d "$prefix"; then
    21683       PKG_CONFIG_PATH="$prefix/lib//pkgconfig:$PKG_CONFIG_PATH"
     21680      PKG_CONFIG_PATH="$prefix/lib/pkgconfig:$PKG_CONFIG_PATH"
    2168421681    fi
    2168521682
     
    2169321690   { (exit 1); exit 1; }; }
    2169421691       fi
    21695        PKG_CONFIG_PATH="$withval/lib//pkgconfig:$PKG_CONFIG_PATH"
     21692       PKG_CONFIG_PATH="$withval/lib/pkgconfig:$PKG_CONFIG_PATH"
    2169621693
    2169721694fi;
     
    2172321720if test "$coin_has_clp" = notGiven; then
    2172421721  if test -d $srcdir//Clp; then
    21725     coin_pkg_is_here=no
    21726      coin_pkg_is_here=yes
    21727 
    21728     if test $coin_pkg_is_here = yes; then
     21722     coin_have_project_dir=yes
     21723
     21724    if test $coin_have_project_dir = yes; then
    2172921725      coin_has_clp=/Clp
    2173021726    fi
     
    2173721733echo "$as_me:$LINENO: checking whether project Clp need to be configured" >&5
    2173821734echo $ECHO_N "checking whether project Clp need to be configured... $ECHO_C" >&6
    21739 if test "$coin_has_clp" != skipping &&
    21740    test "$coin_has_clp" != notGiven &&
    21741    test "$coin_has_clp" != installed; then
     21735if test "$coin_have_project_dir" = yes ; then
    2174221736
    2174321737  if test -r $srcdir//Clp/configure; then
Note: See TracChangeset for help on using the changeset viewer.