Changeset 167


Ignore:
Timestamp:
Jun 24, 2009 12:00:54 PM (12 years ago)
Author:
pbelotti
Message:

updated again

Location:
stable/0.2
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • stable/0.2

    • Property svn:externals
      •  

        old new  
        11BuildTools     https://projects.coin-or.org/svn/BuildTools/stable/0.5
        2 CoinUtils      https://projects.coin-or.org/svn/CoinUtils/stable/2.6/CoinUtils
         2CoinUtils      https://projects.coin-or.org/svn/CoinUtils/stable/2.5/CoinUtils
        33ThirdParty/ASL https://projects.coin-or.org/svn/BuildTools/ThirdParty/ASL/stable/1.0
        44ThirdParty/Blas https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/stable/1.0
  • stable/0.2/acinclude.m4

    r5 r167  
    63966396AC_MSG_RESULT([$SED])
    63976397])
    6398 # Copyright (C) 2006, 2007 International Business Machines.
     6398# Copyright (C) 2006, 2009 International Business Machines.
    63996399# All Rights Reserved.
    64006400# This file is distributed under the Common Public License.
    64016401#
    6402 ## $Id: coin.m4 1168 2008-09-01 09:13:27Z stefan $
     6402## $Id: coin.m4 1272 2009-04-24 16:33:02Z andreasw $
    64036403#
    64046404# Author: Andreas Wachter    IBM      2006-04-14
     
    93809380      fi
    93819381    fi
    9382   else
     9382  elif test "$use_lapack" != no; then
    93839383    AC_MSG_CHECKING([whether user supplied LAPACKLIB=\"$use_lapack\" works])
    93849384    LIBS="$use_lapack $LIBS"
     
    94659465AM_CONDITIONAL([COIN_BUILD_LAPACK],[test "$use_lapack" = BUILD])
    94669466
    9467 if test x"$use_lapack" = x; then
     9467if test x"$use_lapack" = x || test "$use_lapack" = no; then
    94689468  coin_has_lapack=no
    94699469else
     
    95009500#check if user provides a MUMPS library (that works)
    95019501AC_LANG_PUSH(C)
     9502SAVE_ADDLIBS="$ADDLIBS"
     9503ADDLIBS="$ADDLIBS $FLIBS"
    95029504AC_COIN_HAS_USER_LIBRARY(mumps, MUMPS, dmumps_c.h, dmumps_c)
     9505ADDLIBS="$SAVE_ADDLIBS"
    95039506AC_LANG_POP(C)
    95049507
     
    95529555
    95539556]) # AC_COIN_HAS_MUMPS
     9557
     9558###########################################################################
     9559#                            COIN_HAS_METIS                               #
     9560###########################################################################
     9561
     9562# This macro checks for a library containing the METIS library.  It
     9563# checks if the user has provided an argument for the METIS library,
     9564# and if not, it checks whether the METIS ThirdParty/Metis directory has
     9565# been configured.  It adds to ADDLIBS any flags required to link with
     9566# an externally provided METIS.  It defines the makefile conditional
     9567# and preprocessor macro COIN_HAS_METIS, if METIS is available, and it
     9568# defines the makefile conditional COIN_BUILD_METIS, if METIS is
     9569# compiled within COIN.
     9570
     9571AC_DEFUN([AC_COIN_HAS_METIS],
     9572[
     9573case "$PACKAGE_NAME" in
     9574  ThirdParty*)
     9575    coin_metisobjdir=../Metis
     9576    ;;
     9577  *)
     9578    coin_metisobjdir=../ThirdParty/Metis
     9579    ;;
     9580esac
     9581
     9582MAKEOKFILE=.MakeOk
     9583
     9584#check if user provides a METIS library (that works)
     9585AC_LANG_PUSH(C)
     9586AC_ARG_WITH(metis,
     9587   AS_HELP_STRING([--with-metis], [specify flags to link with METIS library]),
     9588   [METISLIB="$withval"; coin_has_metis=true], [coin_has_metis=no])
     9589
     9590if test $coin_has_metis = true; then
     9591  coin_save_LIBS="$LIBS"
     9592  LIBS="$METISLIB $ADDLIBS"
     9593  AC_MSG_CHECKING([whether symbol metis_nodend is available with ])
     9594  AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],[[metis_nodend()]])],
     9595     [AC_MSG_RESULT(yes)],
     9596     [AC_MSG_RESULT(no)
     9597      AC_MSG_ERROR([User-supplied METIS library does not work])])
     9598  LIBS="$coin_save_LIBS"
     9599fi
     9600AC_LANG_POP(C)
     9601
     9602if test "$coin_has_metis" = "true"; then  # user provided metis library
     9603  use_metis=yes
     9604  coin_has_metis=yes
     9605
     9606  ADDLIBS="$METISLIB $ADDLIBS"
     9607
     9608else # no user provided library, so we try to build our own
     9609  use_metis=BUILD
     9610
     9611  # Check if the METIS' ThirdParty project has been configured
     9612  if test "$PACKAGE_NAME" != ThirdPartyMetis; then
     9613    if test -r $coin_metisobjdir/.MakeOk; then
     9614      use_metis=BUILD
     9615    else
     9616      use_metis=
     9617    fi
     9618  fi
     9619
     9620  if test x"$use_metis" != x; then
     9621    coin_has_metis=yes
     9622  else
     9623    coin_has_metis=no
     9624  fi
     9625  AC_MSG_CHECKING([whether METIS is available])
     9626  AC_MSG_RESULT([$coin_has_metis])
     9627fi
     9628
     9629AM_CONDITIONAL([COIN_HAS_METIS],[test $coin_has_metis = yes])
     9630if test $coin_has_metis = yes; then
     9631  AC_DEFINE([COIN_HAS_METIS],[1],[If defined, the METIS library is available.])
     9632fi
     9633
     9634]) # AC_COIN_HAS_METIS
     9635
    95549636
    95559637###########################################################################
  • stable/0.2/configure

    r93 r167  
    22# From configure.ac 0.0.
    33# Guess values for system-dependent variables and create Makefiles.
    4 # Generated by GNU Autoconf 2.59 for Couenne 0.2.
     4# Generated by GNU Autoconf 2.59 for Couenne 0.2stable.
    55#
    66# Report bugs to <belotti@lehigh.edu>.
     
    431431PACKAGE_NAME='Couenne'
    432432PACKAGE_TARNAME='couenne'
    433 PACKAGE_VERSION='0.2'
    434 PACKAGE_STRING='Couenne 0.2'
     433PACKAGE_VERSION='0.2stable'
     434PACKAGE_STRING='Couenne 0.2stable'
    435435PACKAGE_BUGREPORT='belotti@lehigh.edu'
    436436
     
    10361036  # This message is too long to be a string in the A/UX 3.1 sh.
    10371037  cat <<_ACEOF
    1038 \`configure' configures Couenne 0.2 to adapt to many kinds of systems.
     1038\`configure' configures Couenne 0.2stable to adapt to many kinds of systems.
    10391039
    10401040Usage: $0 [OPTION]... [VAR=VALUE]...
     
    11021102if test -n "$ac_init_help"; then
    11031103  case $ac_init_help in
    1104      short | recursive ) echo "Configuration of Couenne 0.2:";;
     1104     short | recursive ) echo "Configuration of Couenne 0.2stable:";;
    11051105   esac
    11061106  cat <<\_ACEOF
     
    12691269if $ac_init_version; then
    12701270  cat <<\_ACEOF
    1271 Couenne configure 0.2
     1271Couenne configure 0.2stable
    12721272generated by GNU Autoconf 2.59
    12731273
     
    12891289running configure, to aid debugging if configure makes a mistake.
    12901290
    1291 It was created by Couenne $as_me 0.2, which was
     1291It was created by Couenne $as_me 0.2stable, which was
    12921292generated by GNU Autoconf 2.59.  Invocation command line was
    12931293
     
    51275127# Define the identity of the package.
    51285128 PACKAGE='couenne'
    5129  VERSION='0.2'
     5129 VERSION='0.2stable'
    51305130
    51315131
     
    2178121781cat >&5 <<_CSEOF
    2178221782
    21783 This file was extended by Couenne $as_me 0.2, which was
     21783This file was extended by Couenne $as_me 0.2stable, which was
    2178421784generated by GNU Autoconf 2.59.  Invocation command line was
    2178521785
     
    2183921839cat >>$CONFIG_STATUS <<_ACEOF
    2184021840ac_cs_version="\\
    21841 Couenne config.status 0.2
     21841Couenne config.status 0.2stable
    2184221842configured by $0, generated by GNU Autoconf 2.59,
    2184321843  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
Note: See TracChangeset for help on using the changeset viewer.