Changeset 1123


Ignore:
Timestamp:
Aug 22, 2008 1:22:45 PM (11 years ago)
Author:
stefan
Message:

merge changes from BSP (compile dlamch in nonoptimized mode) and reran autotools to get bsp changes; https://projects.coin-or.org/BuildTools/log/ThirdParty/Lapack/stable/BSP

Location:
ThirdParty/Lapack/trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • ThirdParty/Lapack/trunk/Makefile.am

    r229 r1123  
    1 # Copyright (C) 2006, 2007 International Business Machines and others.
     1# Copyright (C) 2006, 2008 International Business Machines and others.
    22# All Rights Reserved.
    33# This file is distributed under the Common Public License.
     
    5858libcoinlapack_la_LDFLAGS = $(LT_LDFLAGS)
    5959
     60dlamch.o: dlamch.f
     61        $(F77) $(AM_FFLAGS) $(DBG_FFLAGS) -c -o $@ $<
     62
     63dlamch.obj: dlamch.f
     64        $(F77) $(AM_FFLAGS) $(DBG_FFLAGS) -c -o $@ `$(CYGPATH_W) '$<'`
     65
     66dlamch.lo: dlamch.f
     67        $(LIBTOOL) --tag=F77 --mode=compile $(F77) $(AM_FFLAGS) $(DLAMCH_FFLAGS) -c -o $@ $<
     68
    6069########################################################################
    6170#                         Maintainer Stuff                             #
  • ThirdParty/Lapack/trunk/Makefile.in

    r996 r1123  
    1515@SET_MAKE@
    1616
    17 # Copyright (C) 2006, 2007 International Business Machines and others.
     17# Copyright (C) 2006, 2008 International Business Machines and others.
    1818# All Rights Reserved.
    1919# This file is distributed under the Common Public License.
     
    142142DEFS = @DEFS@
    143143DEPDIR = @DEPDIR@
     144DLAMCH_FFLAGS = @DLAMCH_FFLAGS@
    144145ECHO = @ECHO@
    145146ECHO_C = @ECHO_C@
     
    646647
    647648
     649dlamch.o: dlamch.f
     650        $(F77) $(AM_FFLAGS) $(DBG_FFLAGS) -c -o $@ $<
     651
     652dlamch.obj: dlamch.f
     653        $(F77) $(AM_FFLAGS) $(DBG_FFLAGS) -c -o $@ `$(CYGPATH_W) '$<'`
     654
     655dlamch.lo: dlamch.f
     656        $(LIBTOOL) --tag=F77 --mode=compile $(F77) $(AM_FFLAGS) $(DLAMCH_FFLAGS) -c -o $@ $<
     657
    648658install-doc: $(DocFiles)
    649659        test -z "$(DocInstallDir)" || $(mkdir_p) "$(DESTDIR)$(DocInstallDir)"
  • ThirdParty/Lapack/trunk/configure

    r1053 r1123  
    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 ADDLIBS FADDLIBS ALWAYS_FALSE_TRUE ALWAYS_FALSE_FALSE build build_cpu build_vendor build_os CDEFS ADD_CFLAGS DBG_CFLAGS OPT_CFLAGS sol_cc_compiler CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT MPICC ADD_FFLAGS DBG_FFLAGS OPT_FFLAGS F77 FFLAGS ac_ct_F77 MPIF77 EGREP 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 LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP LIBTOOL ac_c_preproc_warn_flag ac_cxx_preproc_warn_flag RPATH_FLAGS LT_LDFLAGS FLIBS COIN_HAS_BLAS_TRUE COIN_HAS_BLAS_FALSE COIN_BUILD_BLAS_TRUE COIN_BUILD_BLAS_FALSE COIN_HAS_LAPACK_TRUE COIN_HAS_LAPACK_FALSE COIN_BUILD_LAPACK_TRUE COIN_BUILD_LAPACK_FALSE MAKEOKFILE SKIPMAKE_TRUE SKIPMAKE_FALSE LIBEXT VPATH_DISTCLEANFILES 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 ADDLIBS FADDLIBS ALWAYS_FALSE_TRUE ALWAYS_FALSE_FALSE build build_cpu build_vendor build_os CDEFS ADD_CFLAGS DBG_CFLAGS OPT_CFLAGS sol_cc_compiler CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT MPICC ADD_FFLAGS DBG_FFLAGS OPT_FFLAGS F77 FFLAGS ac_ct_F77 MPIF77 DLAMCH_FFLAGS EGREP 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 LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP LIBTOOL ac_c_preproc_warn_flag ac_cxx_preproc_warn_flag RPATH_FLAGS LT_LDFLAGS FLIBS COIN_HAS_BLAS_TRUE COIN_HAS_BLAS_FALSE COIN_BUILD_BLAS_TRUE COIN_BUILD_BLAS_FALSE COIN_HAS_LAPACK_TRUE COIN_HAS_LAPACK_FALSE COIN_BUILD_LAPACK_TRUE COIN_BUILD_LAPACK_FALSE MAKEOKFILE SKIPMAKE_TRUE SKIPMAKE_FALSE LIBEXT VPATH_DISTCLEANFILES LIBOBJS LTLIBOBJS'
    476476ac_subst_files=''
    477477
     
    26992699        coin_add_cflags="-pipe"
    27002700        coin_dbg_cflags="-g"
    2701         coin_warn_cflags="-pedantic-errors -Wimplicit -Wparentheses -Wsequence-point -Wreturn-type -Wcast-qual -Wall"
     2701        coin_warn_cflags="-Wimplicit -Wparentheses -Wsequence-point -Wreturn-type -Wcast-qual -Wall -Wno-unknown-pragmas"
     2702        case $build in
     2703          *-darwin*)
     2704            ;;
     2705          *)
     2706            coin_warn_cflags="-pedantic-errors $coin_warn_cflags"
     2707            ;;
     2708        esac
    27022709        case $enable_doscompile in
    27032710          mingw)
     
    27722779        case "$CC" in
    27732780          icc* | */icc*)
    2774             coin_opt_cflags="-O3 -ip"
     2781            coin_opt_cflags="-O3 -ip -mp1"
    27752782            coin_add_cflags=""
    27762783            coin_dbg_cflags="-g"
     
    31083115     fi ;;
    31093116  *-*-solaris*)
    3110      coin_f77_comps="f95 f90 f77 xlf fort77 gfortran g77 pgf90 pgf77 ifort ifc frt af77" ;;
    3111   *) coin_f77_comps="xlf fort77 gfortran f77 g77 pgf90 pgf77 ifort ifc frt af77" ;;
     3117     coin_f77_comps="f95 f90 f77 xlf_r fort77 gfortran g77 pgf90 pgf77 ifort ifc frt af77" ;;
     3118  *) coin_f77_comps="xlf_r fort77 gfortran f77 g77 pgf90 pgf77 ifort ifc frt af77" ;;
    31123119 esac
    31133120
     
    32803287
    32813288# Provide some information about the compiler.
    3282 echo "$as_me:3282:" \
     3289echo "$as_me:3289:" \
    32833290     "checking for Fortran 77 compiler version" >&5
    32843291ac_compiler=`set X $ac_compile; echo $2`
     
    34953502        case $F77 in
    34963503          ifort* | */ifort* | IFORT* | */IFORT* )
    3497             coin_opt_fflags='-O3'
    3498             coin_add_fflags='-fpp -nologo -MT'
    3499             coin_dbg_fflags='-debug'
     3504            coin_opt_fflags='-MT -O3'
     3505            coin_add_fflags='-fpp -nologo'
     3506            coin_dbg_fflags='-MTd -debug'
    35003507          ;;
    35013508          compile_f2c*)
     
    37943801ac_compiler_gnu=$ac_cv_c_compiler_gnu
    37953802
     3803
     3804
     3805#Setup special Fortran flags for dlamch.f:
     3806#do not use optimiziation flags in default (=optimized) mode, but use debug flags in debug mode
     3807if test "$coin_debug_compile" = true ; then
     3808  DLAMCH_FFLAGS="$DBG_FFLAGS"
     3809else
     3810  DLAMCH_FFLAGS="$coin_add_fflags $coin_warn_fflags $ADD_FFLAGS"
     3811fi
    37963812
    37973813
     
    54295445*-*-irix6*)
    54305446  # Find out which ABI we are using.
    5431   echo '#line 5431 "configure"' > conftest.$ac_ext
     5447  echo '#line 5447 "configure"' > conftest.$ac_ext
    54325448  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    54335449  (eval $ac_compile) 2>&5
     
    78587874   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    78597875   -e 's:$: $lt_compiler_flag:'`
    7860    (eval echo "\"\$as_me:7860: $lt_compile\"" >&5)
     7876   (eval echo "\"\$as_me:7876: $lt_compile\"" >&5)
    78617877   (eval "$lt_compile" 2>conftest.err)
    78627878   ac_status=$?
    78637879   cat conftest.err >&5
    7864    echo "$as_me:7864: \$? = $ac_status" >&5
     7880   echo "$as_me:7880: \$? = $ac_status" >&5
    78657881   if (exit $ac_status) && test -s "$ac_outfile"; then
    78667882     # The compiler can only warn and ignore the option if not recognized
     
    81268142   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    81278143   -e 's:$: $lt_compiler_flag:'`
    8128    (eval echo "\"\$as_me:8128: $lt_compile\"" >&5)
     8144   (eval echo "\"\$as_me:8144: $lt_compile\"" >&5)
    81298145   (eval "$lt_compile" 2>conftest.err)
    81308146   ac_status=$?
    81318147   cat conftest.err >&5
    8132    echo "$as_me:8132: \$? = $ac_status" >&5
     8148   echo "$as_me:8148: \$? = $ac_status" >&5
    81338149   if (exit $ac_status) && test -s "$ac_outfile"; then
    81348150     # The compiler can only warn and ignore the option if not recognized
     
    82308246   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    82318247   -e 's:$: $lt_compiler_flag:'`
    8232    (eval echo "\"\$as_me:8232: $lt_compile\"" >&5)
     8248   (eval echo "\"\$as_me:8248: $lt_compile\"" >&5)
    82338249   (eval "$lt_compile" 2>out/conftest.err)
    82348250   ac_status=$?
    82358251   cat out/conftest.err >&5
    8236    echo "$as_me:8236: \$? = $ac_status" >&5
     8252   echo "$as_me:8252: \$? = $ac_status" >&5
    82378253   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    82388254   then
     
    1057510591  lt_status=$lt_dlunknown
    1057610592  cat > conftest.$ac_ext <<EOF
    10577 #line 10577 "configure"
     10593#line 10593 "configure"
    1057810594#include "confdefs.h"
    1057910595
     
    1067510691  lt_status=$lt_dlunknown
    1067610692  cat > conftest.$ac_ext <<EOF
    10677 #line 10677 "configure"
     10693#line 10693 "configure"
    1067810694#include "confdefs.h"
    1067910695
     
    1301913035   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1302013036   -e 's:$: $lt_compiler_flag:'`
    13021    (eval echo "\"\$as_me:13021: $lt_compile\"" >&5)
     13037   (eval echo "\"\$as_me:13037: $lt_compile\"" >&5)
    1302213038   (eval "$lt_compile" 2>conftest.err)
    1302313039   ac_status=$?
    1302413040   cat conftest.err >&5
    13025    echo "$as_me:13025: \$? = $ac_status" >&5
     13041   echo "$as_me:13041: \$? = $ac_status" >&5
    1302613042   if (exit $ac_status) && test -s "$ac_outfile"; then
    1302713043     # The compiler can only warn and ignore the option if not recognized
     
    1312313139   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1312413140   -e 's:$: $lt_compiler_flag:'`
    13125    (eval echo "\"\$as_me:13125: $lt_compile\"" >&5)
     13141   (eval echo "\"\$as_me:13141: $lt_compile\"" >&5)
    1312613142   (eval "$lt_compile" 2>out/conftest.err)
    1312713143   ac_status=$?
    1312813144   cat out/conftest.err >&5
    13129    echo "$as_me:13129: \$? = $ac_status" >&5
     13145   echo "$as_me:13145: \$? = $ac_status" >&5
    1313013146   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1313113147   then
     
    1469314709   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1469414710   -e 's:$: $lt_compiler_flag:'`
    14695    (eval echo "\"\$as_me:14695: $lt_compile\"" >&5)
     14711   (eval echo "\"\$as_me:14711: $lt_compile\"" >&5)
    1469614712   (eval "$lt_compile" 2>conftest.err)
    1469714713   ac_status=$?
    1469814714   cat conftest.err >&5
    14699    echo "$as_me:14699: \$? = $ac_status" >&5
     14715   echo "$as_me:14715: \$? = $ac_status" >&5
    1470014716   if (exit $ac_status) && test -s "$ac_outfile"; then
    1470114717     # The compiler can only warn and ignore the option if not recognized
     
    1479714813   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1479814814   -e 's:$: $lt_compiler_flag:'`
    14799    (eval echo "\"\$as_me:14799: $lt_compile\"" >&5)
     14815   (eval echo "\"\$as_me:14815: $lt_compile\"" >&5)
    1480014816   (eval "$lt_compile" 2>out/conftest.err)
    1480114817   ac_status=$?
    1480214818   cat out/conftest.err >&5
    14803    echo "$as_me:14803: \$? = $ac_status" >&5
     14819   echo "$as_me:14819: \$? = $ac_status" >&5
    1480414820   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1480514821   then
     
    1700417020   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1700517021   -e 's:$: $lt_compiler_flag:'`
    17006    (eval echo "\"\$as_me:17006: $lt_compile\"" >&5)
     17022   (eval echo "\"\$as_me:17022: $lt_compile\"" >&5)
    1700717023   (eval "$lt_compile" 2>conftest.err)
    1700817024   ac_status=$?
    1700917025   cat conftest.err >&5
    17010    echo "$as_me:17010: \$? = $ac_status" >&5
     17026   echo "$as_me:17026: \$? = $ac_status" >&5
    1701117027   if (exit $ac_status) && test -s "$ac_outfile"; then
    1701217028     # The compiler can only warn and ignore the option if not recognized
     
    1727217288   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1727317289   -e 's:$: $lt_compiler_flag:'`
    17274    (eval echo "\"\$as_me:17274: $lt_compile\"" >&5)
     17290   (eval echo "\"\$as_me:17290: $lt_compile\"" >&5)
    1727517291   (eval "$lt_compile" 2>conftest.err)
    1727617292   ac_status=$?
    1727717293   cat conftest.err >&5
    17278    echo "$as_me:17278: \$? = $ac_status" >&5
     17294   echo "$as_me:17294: \$? = $ac_status" >&5
    1727917295   if (exit $ac_status) && test -s "$ac_outfile"; then
    1728017296     # The compiler can only warn and ignore the option if not recognized
     
    1737617392   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1737717393   -e 's:$: $lt_compiler_flag:'`
    17378    (eval echo "\"\$as_me:17378: $lt_compile\"" >&5)
     17394   (eval echo "\"\$as_me:17394: $lt_compile\"" >&5)
    1737917395   (eval "$lt_compile" 2>out/conftest.err)
    1738017396   ac_status=$?
    1738117397   cat out/conftest.err >&5
    17382    echo "$as_me:17382: \$? = $ac_status" >&5
     17398   echo "$as_me:17398: \$? = $ac_status" >&5
    1738317399   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1738417400   then
     
    2031820334ac_save_FFLAGS=$FFLAGS
    2031920335FFLAGS="$FFLAGS $ac_verb"
    20320 (eval echo $as_me:20320: \"$ac_link\") >&5
     20336(eval echo $as_me:20336: \"$ac_link\") >&5
    2032120337ac_f77_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'`
    2032220338echo "$ac_f77_v_output" >&5
     
    2039620412ac_save_FFLAGS=$FFLAGS
    2039720413FFLAGS="$FFLAGS $ac_cv_prog_f77_v"
    20398 (eval echo $as_me:20398: \"$ac_link\") >&5
     20414(eval echo $as_me:20414: \"$ac_link\") >&5
    2039920415ac_f77_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'`
    2040020416echo "$ac_f77_v_output" >&5
     
    2099121007ac_compiler_gnu=$ac_cv_c_compiler_gnu
    2099221008
    20993 if test "$PACKAGE_NAME" = ThirdPartyBlas || test "$PACKAGE_NAME" = ThirdPartyLapack; then
     21009if test "$PACKAGE_NAME" = ThirdPartyBlas || test "$PACKAGE_NAME" = ThirdPartyLapack || test "$PACKAGE_NAME" = ThirdPartyMumps; then
    2099421010  coin_blasobjdir=../Blas
    2099521011else
     
    2584025856s,@ac_ct_F77@,$ac_ct_F77,;t t
    2584125857s,@MPIF77@,$MPIF77,;t t
     25858s,@DLAMCH_FFLAGS@,$DLAMCH_FFLAGS,;t t
    2584225859s,@EGREP@,$EGREP,;t t
    2584325860s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
  • ThirdParty/Lapack/trunk/configure.ac

    r996 r1123  
    5151AC_COIN_PROG_F77
    5252
     53#Setup special Fortran flags for dlamch.f:
     54#do not use optimiziation flags in default (=optimized) mode, but use debug flags in debug mode
     55if test "$coin_debug_compile" = true ; then
     56  DLAMCH_FFLAGS="$DBG_FFLAGS"
     57else
     58  DLAMCH_FFLAGS="$coin_add_fflags $coin_warn_fflags $ADD_FFLAGS"
     59fi
     60AC_SUBST(DLAMCH_FFLAGS)
     61
    5362# Initialize autotools
    5463AC_COIN_INIT_AUTO_TOOLS
Note: See TracChangeset for help on using the changeset viewer.