Changeset 1439


Ignore:
Timestamp:
Nov 1, 2009 2:51:52 PM (11 years ago)
Author:
stefan
Message:

rerun autotools

File:
1 edited

Legend:

Unmodified
Added
Removed
  • ThirdParty/Mumps/branches/BSPsplit/configure

    r1435 r1439  
    2166521665
    2166621666
     21667
    2166721668#check if user provided LIBS, CFLAGS, and DATA for module
    2166821669if test $coin_has_blas != skipping; then
     
    2167421675  coin_has_blas=yes
    2167521676       BLAS_LIBS="$withval"
     21677       ADDLIBS="$ADDLIBS $withval"
     21678
    2167621679fi;
    2167721680
     
    2170721710   { (exit 1); exit 1; }; }
    2170821711       fi
    21709        PKG_CONFIG_PATH="$withval/lib/pkgconfig:$PKG_CONFIG_PATH",
     21712       PKG_CONFIG_PATH="$withval/lib/pkgconfig:$withval/lib/ThirdParty/pkgconfig:$withval/lib/Data/pkgconfig:$PKG_CONFIG_PATH",
    2171021713
    2171121714fi;
     
    2172121724# check if directory $srcdir/../Blas exists and add ../Blas to the PKG_CONFIG_PATH
    2172221725# this is for the classic setup where an uninstalled project can be found in ../Blas
     21726# we do the same for ThirdParty/Blas and Data/Blas; it's not nice but the only way I see to easily get around these nonstandard locations
    2172321727if test -d $srcdir/../$pkgname; then
    2172421728  PKG_CONFIG_PATH="../$pkgname:$PKG_CONFIG_PATH"
    2172521729fi
     21730if test -d $srcdir/../ThirdParty/$pkgname; then
     21731  PKG_CONFIG_PATH="../ThirdParty/$pkgname$PKG_CONFIG_PATH"
     21732fi
     21733if test -d $srcdir/../Data/$pkgname; then
     21734  PKG_CONFIG_PATH="../Data/$pkgname:$PKG_CONFIG_PATH"
     21735fi
     21736
    2172621737
    2172721738
     
    2174321754  if $PKG_CONFIG --exists "$module_content"; then
    2174421755    BLAS_VERSIONS="`$PKG_CONFIG --modversion $module_content 2>/dev/null`"
    21745      BLAS_CFLAGS=`$PKG_CONFIG --cflags "blas" 2>/dev/null`
    21746     BLAS_LIBS=`$PKG_CONFIG --libs "blas" 2>/dev/null`
    21747     BLAS_DATA=`$PKG_CONFIG --variable=datadir "blas" 2>/dev/null`
     21756     BLAS_CFLAGS=`$PKG_CONFIG --cflags "$module_content" 2>/dev/null`
     21757    BLAS_LIBS=`$PKG_CONFIG --libs "$module_content" 2>/dev/null`
     21758    BLAS_DATA=`$PKG_CONFIG --variable=datadir "$module_content" 2>/dev/null`
    2174821759     coin_has_blas=yes
    2174921760        echo "$as_me:$LINENO: result: yes: $BLAS_VERSIONS" >&5
    2175021761echo "${ECHO_T}yes: $BLAS_VERSIONS" >&6
    2175121762        REQUIREDPACKAGES="$REQUIREDPACKAGES $module_content"
    21752 
    2175321763
    2175421764
     
    2178221792if test $coin_has_blas != skipping &&
    2178321793   test $coin_has_blas != notGiven ; then
    21784   if test "x$BLAS_CFLAGS" != x ; then
     21794  if test -n "$BLAS_CFLAGS" ; then
    2178521795    { echo "$as_me:$LINENO: Blas CFLAGS are $BLAS_CFLAGS" >&5
    2178621796echo "$as_me: Blas CFLAGS are $BLAS_CFLAGS" >&6;}
    2178721797  fi
    21788   if test "x$BLAS_LIBS" != x ; then
     21798  if test -n "$BLAS_LIBS" ; then
    2178921799    { echo "$as_me:$LINENO: Blas LIBS   are $BLAS_LIBS" >&5
    2179021800echo "$as_me: Blas LIBS   are $BLAS_LIBS" >&6;}
    2179121801  fi
    21792   if test "x$BLAS_DATA" != x ; then
     21802  if test -n "$BLAS_DATA" ; then
    2179321803    { echo "$as_me:$LINENO: Blas DATA   is  $BLAS_DATA" >&5
    2179421804echo "$as_me: Blas DATA   is  $BLAS_DATA" >&6;}
     
    2183721847
    2183821848
     21849
    2183921850#check if user provided LIBS, CFLAGS, and DATA for module
    2184021851if test $coin_has_metis != skipping; then
     
    2184621857  coin_has_metis=yes
    2184721858       METIS_LIBS="$withval"
     21859       ADDLIBS="$ADDLIBS $withval"
     21860
    2184821861fi;
    2184921862
     
    2187921892   { (exit 1); exit 1; }; }
    2188021893       fi
    21881        PKG_CONFIG_PATH="$withval/lib/pkgconfig:$PKG_CONFIG_PATH",
     21894       PKG_CONFIG_PATH="$withval/lib/pkgconfig:$withval/lib/ThirdParty/pkgconfig:$withval/lib/Data/pkgconfig:$PKG_CONFIG_PATH",
    2188221895
    2188321896fi;
     
    2189321906# check if directory $srcdir/../Metis >= 4.0 exists and add ../Metis >= 4.0 to the PKG_CONFIG_PATH
    2189421907# this is for the classic setup where an uninstalled project can be found in ../Metis >= 4.0
     21908# we do the same for ThirdParty/Metis >= 4.0 and Data/Metis >= 4.0; it's not nice but the only way I see to easily get around these nonstandard locations
    2189521909if test -d $srcdir/../$pkgname; then
    2189621910  PKG_CONFIG_PATH="../$pkgname:$PKG_CONFIG_PATH"
    2189721911fi
     21912if test -d $srcdir/../ThirdParty/$pkgname; then
     21913  PKG_CONFIG_PATH="../ThirdParty/$pkgname$PKG_CONFIG_PATH"
     21914fi
     21915if test -d $srcdir/../Data/$pkgname; then
     21916  PKG_CONFIG_PATH="../Data/$pkgname:$PKG_CONFIG_PATH"
     21917fi
     21918
    2189821919
    2189921920
     
    2191521936  if $PKG_CONFIG --exists "$module_content"; then
    2191621937    METIS_VERSIONS="`$PKG_CONFIG --modversion $module_content 2>/dev/null`"
    21917      METIS_CFLAGS=`$PKG_CONFIG --cflags "metis" 2>/dev/null`
    21918     METIS_LIBS=`$PKG_CONFIG --libs "metis" 2>/dev/null`
    21919     METIS_DATA=`$PKG_CONFIG --variable=datadir "metis" 2>/dev/null`
     21938     METIS_CFLAGS=`$PKG_CONFIG --cflags "$module_content" 2>/dev/null`
     21939    METIS_LIBS=`$PKG_CONFIG --libs "$module_content" 2>/dev/null`
     21940    METIS_DATA=`$PKG_CONFIG --variable=datadir "$module_content" 2>/dev/null`
    2192021941     coin_has_metis=yes
    2192121942        echo "$as_me:$LINENO: result: yes: $METIS_VERSIONS" >&5
    2192221943echo "${ECHO_T}yes: $METIS_VERSIONS" >&6
    2192321944        REQUIREDPACKAGES="$REQUIREDPACKAGES $module_content"
    21924 
    2192521945
    2192621946
     
    2195421974if test $coin_has_metis != skipping &&
    2195521975   test $coin_has_metis != notGiven ; then
    21956   if test "x$METIS_CFLAGS" != x ; then
     21976  if test -n "$METIS_CFLAGS" ; then
    2195721977    { echo "$as_me:$LINENO: Metis CFLAGS are $METIS_CFLAGS" >&5
    2195821978echo "$as_me: Metis CFLAGS are $METIS_CFLAGS" >&6;}
    2195921979  fi
    21960   if test "x$METIS_LIBS" != x ; then
     21980  if test -n "$METIS_LIBS" ; then
    2196121981    { echo "$as_me:$LINENO: Metis LIBS   are $METIS_LIBS" >&5
    2196221982echo "$as_me: Metis LIBS   are $METIS_LIBS" >&6;}
    2196321983  fi
    21964   if test "x$METIS_DATA" != x ; then
     21984  if test -n "$METIS_DATA" ; then
    2196521985    { echo "$as_me:$LINENO: Metis DATA   is  $METIS_DATA" >&5
    2196621986echo "$as_me: Metis DATA   is  $METIS_DATA" >&6;}
Note: See TracChangeset for help on using the changeset viewer.