Ignore:
Timestamp:
May 1, 2010 6:25:18 AM (11 years ago)
Author:
stefan
Message:

rerun autotools; improve setup of addlibs file

Location:
ThirdParty/Lapack/branches/split
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • ThirdParty/Lapack/branches/split/Makefile.am

    r1539 r1542  
    9797
    9898lapack_addlibs.txt : coinlapack.pc
    99         PKG_CONFIG_PATH=.:$(libdir)/pkgconfig:${PKG_CONFIG_PATH} $(PKG_CONFIG) --libs coinlapack > lapack_addlibs.txt
     99        PKG_CONFIG_PATH=.:@COIN_PKG_CONFIG_PATH@ $(PKG_CONFIG) --libs coinlapack > lapack_addlibs.txt
    100100endif
    101101
  • ThirdParty/Lapack/branches/split/Makefile.in

    r1539 r1542  
    143143COIN_HAS_PKGCONFIG_FALSE = @COIN_HAS_PKGCONFIG_FALSE@
    144144COIN_HAS_PKGCONFIG_TRUE = @COIN_HAS_PKGCONFIG_TRUE@
     145COIN_PKG_CONFIG_PATH = @COIN_PKG_CONFIG_PATH@
    145146CPP = @CPP@
    146147CPPFLAGS = @CPPFLAGS@
     
    766767
    767768@COIN_HAS_PKGCONFIG_TRUE@lapack_addlibs.txt : coinlapack.pc
    768 @COIN_HAS_PKGCONFIG_TRUE@       PKG_CONFIG_PATH=.:$(libdir)/pkgconfig:${PKG_CONFIG_PATH} $(PKG_CONFIG) --libs coinlapack > lapack_addlibs.txt
     769@COIN_HAS_PKGCONFIG_TRUE@       PKG_CONFIG_PATH=.:@COIN_PKG_CONFIG_PATH@ $(PKG_CONFIG) --libs coinlapack > lapack_addlibs.txt
    769770
    770771install-doc: $(DocFiles)
  • ThirdParty/Lapack/branches/split/configure

    r1539 r1542  
    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 FLIBS PKG_CONFIG ac_pt_PKG_CONFIG COIN_HAS_PKGCONFIG_TRUE COIN_HAS_PKGCONFIG_FALSE 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 LIBEXT VPATH_DISTCLEANFILES ABSBUILDDIR 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 FLIBS PKG_CONFIG ac_pt_PKG_CONFIG COIN_HAS_PKGCONFIG_TRUE COIN_HAS_PKGCONFIG_FALSE COIN_PKG_CONFIG_PATH 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 LIBEXT VPATH_DISTCLEANFILES ABSBUILDDIR LIBOBJS LTLIBOBJS'
    476476ac_subst_files=''
    477477
     
    11051105  --with-lapack-checklevel
    11061106                          specify the sanity check level for project Lapack
     1107  --with-coin-instdir     prefix of installation directory for precompiled
     1108                          COIN packages
    11071109  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
    11081110  --with-pic              try to use only PIC/non-PIC objects [default=use
     
    33043306
    33053307# Provide some information about the compiler.
    3306 echo "$as_me:3306:" \
     3308echo "$as_me:3308:" \
    33073309     "checking for Fortran 77 compiler version" >&5
    33083310ac_compiler=`set X $ac_compile; echo $2`
     
    38723874ac_save_FFLAGS=$FFLAGS
    38733875FFLAGS="$FFLAGS $ac_verb"
    3874 (eval echo $as_me:3874: \"$ac_link\") >&5
     3876(eval echo $as_me:3876: \"$ac_link\") >&5
    38753877ac_f77_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'`
    38763878echo "$ac_f77_v_output" >&5
     
    39503952ac_save_FFLAGS=$FFLAGS
    39513953FFLAGS="$FFLAGS $ac_cv_prog_f77_v"
    3952 (eval echo $as_me:3952: \"$ac_link\") >&5
     3954(eval echo $as_me:3954: \"$ac_link\") >&5
    39533955ac_f77_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'`
    39543956echo "$ac_f77_v_output" >&5
     
    48344836
    48354837
     4838
     4839# assemble search path for pkg-config, if we are in a project setup
     4840if test x$coin_projectdir = xyes ; then
     4841  COIN_PKG_CONFIG_PATH="$PKG_CONFIG_PATH"
     4842
     4843  # 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
     4844  # best would actually to use ${libdir}, since .pc files get installed into ${libdir}/pkgconfig,
     4845  # unfortunately, ${libdir} expands to ${exec_prefix}/lib and ${exec_prefix} to ${prefix}...
     4846  if test -d "${prefix}"; then
     4847    COIN_PKG_CONFIG_PATH="${prefix}/lib/pkgconfig:${COIN_PKG_CONFIG_PATH}"
     4848  fi
     4849
     4850
     4851# Check whether --with-coin-instdir or --without-coin-instdir was given.
     4852if test "${with_coin_instdir+set}" = set; then
     4853  withval="$with_coin_instdir"
     4854  if test -d "$withval"; then : ; else
     4855       { { echo "$as_me:$LINENO: error: argument for --with-coin-instdir not a directory" >&5
     4856echo "$as_me: error: argument for --with-coin-instdir not a directory" >&2;}
     4857   { (exit 1); exit 1; }; }
     4858     fi
     4859     COIN_PKG_CONFIG_PATH="$withval/lib/pkgconfig:${COIN_PKG_CONFIG_PATH}"
     4860
     4861fi;
     4862
     4863  # in a classic setup, we want to find uninstalled projects
     4864  # their (relative) location is written to coin_subdirs.txt by the configure in the project base directory
     4865  # unfortunately, if the user set prefix, then we do not know where the project base directory is located
     4866  # but it is likely to be either .. (if we are a usual coin project) or ../.. (if we are a unusual coin project like ThirdParty or Data)
     4867  if test -e ../coin_subdirs.txt ; then
     4868    for i in `cat ../coin_subdirs.txt` ; do
     4869      COIN_PKG_CONFIG_PATH="`cd ../$i; pwd`:${COIN_PKG_CONFIG_PATH}"
     4870    done
     4871  fi
     4872
     4873  if test -e ../../coin_subdirs.txt ; then
     4874    for i in `cat ../../coin_subdirs.txt` ; do
     4875      COIN_PKG_CONFIG_PATH="`cd ../../$i; pwd`:${COIN_PKG_CONFIG_PATH}"
     4876    done
     4877  fi
     4878
     4879
     4880fi
    48364881
    48374882
     
    65056550*-*-irix6*)
    65066551  # Find out which ABI we are using.
    6507   echo '#line 6507 "configure"' > conftest.$ac_ext
     6552  echo '#line 6552 "configure"' > conftest.$ac_ext
    65086553  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    65096554  (eval $ac_compile) 2>&5
     
    89829027   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    89839028   -e 's:$: $lt_compiler_flag:'`
    8984    (eval echo "\"\$as_me:8984: $lt_compile\"" >&5)
     9029   (eval echo "\"\$as_me:9029: $lt_compile\"" >&5)
    89859030   (eval "$lt_compile" 2>conftest.err)
    89869031   ac_status=$?
    89879032   cat conftest.err >&5
    8988    echo "$as_me:8988: \$? = $ac_status" >&5
     9033   echo "$as_me:9033: \$? = $ac_status" >&5
    89899034   if (exit $ac_status) && test -s "$ac_outfile"; then
    89909035     # The compiler can only warn and ignore the option if not recognized
     
    92509295   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    92519296   -e 's:$: $lt_compiler_flag:'`
    9252    (eval echo "\"\$as_me:9252: $lt_compile\"" >&5)
     9297   (eval echo "\"\$as_me:9297: $lt_compile\"" >&5)
    92539298   (eval "$lt_compile" 2>conftest.err)
    92549299   ac_status=$?
    92559300   cat conftest.err >&5
    9256    echo "$as_me:9256: \$? = $ac_status" >&5
     9301   echo "$as_me:9301: \$? = $ac_status" >&5
    92579302   if (exit $ac_status) && test -s "$ac_outfile"; then
    92589303     # The compiler can only warn and ignore the option if not recognized
     
    93549399   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    93559400   -e 's:$: $lt_compiler_flag:'`
    9356    (eval echo "\"\$as_me:9356: $lt_compile\"" >&5)
     9401   (eval echo "\"\$as_me:9401: $lt_compile\"" >&5)
    93579402   (eval "$lt_compile" 2>out/conftest.err)
    93589403   ac_status=$?
    93599404   cat out/conftest.err >&5
    9360    echo "$as_me:9360: \$? = $ac_status" >&5
     9405   echo "$as_me:9405: \$? = $ac_status" >&5
    93619406   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    93629407   then
     
    1177111816  lt_status=$lt_dlunknown
    1177211817  cat > conftest.$ac_ext <<EOF
    11773 #line 11773 "configure"
     11818#line 11818 "configure"
    1177411819#include "confdefs.h"
    1177511820
     
    1187111916  lt_status=$lt_dlunknown
    1187211917  cat > conftest.$ac_ext <<EOF
    11873 #line 11873 "configure"
     11918#line 11918 "configure"
    1187411919#include "confdefs.h"
    1187511920
     
    1423114276   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1423214277   -e 's:$: $lt_compiler_flag:'`
    14233    (eval echo "\"\$as_me:14233: $lt_compile\"" >&5)
     14278   (eval echo "\"\$as_me:14278: $lt_compile\"" >&5)
    1423414279   (eval "$lt_compile" 2>conftest.err)
    1423514280   ac_status=$?
    1423614281   cat conftest.err >&5
    14237    echo "$as_me:14237: \$? = $ac_status" >&5
     14282   echo "$as_me:14282: \$? = $ac_status" >&5
    1423814283   if (exit $ac_status) && test -s "$ac_outfile"; then
    1423914284     # The compiler can only warn and ignore the option if not recognized
     
    1433514380   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1433614381   -e 's:$: $lt_compiler_flag:'`
    14337    (eval echo "\"\$as_me:14337: $lt_compile\"" >&5)
     14382   (eval echo "\"\$as_me:14382: $lt_compile\"" >&5)
    1433814383   (eval "$lt_compile" 2>out/conftest.err)
    1433914384   ac_status=$?
    1434014385   cat out/conftest.err >&5
    14341    echo "$as_me:14341: \$? = $ac_status" >&5
     14386   echo "$as_me:14386: \$? = $ac_status" >&5
    1434214387   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1434314388   then
     
    1590515950   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1590615951   -e 's:$: $lt_compiler_flag:'`
    15907    (eval echo "\"\$as_me:15907: $lt_compile\"" >&5)
     15952   (eval echo "\"\$as_me:15952: $lt_compile\"" >&5)
    1590815953   (eval "$lt_compile" 2>conftest.err)
    1590915954   ac_status=$?
    1591015955   cat conftest.err >&5
    15911    echo "$as_me:15911: \$? = $ac_status" >&5
     15956   echo "$as_me:15956: \$? = $ac_status" >&5
    1591215957   if (exit $ac_status) && test -s "$ac_outfile"; then
    1591315958     # The compiler can only warn and ignore the option if not recognized
     
    1600916054   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1601016055   -e 's:$: $lt_compiler_flag:'`
    16011    (eval echo "\"\$as_me:16011: $lt_compile\"" >&5)
     16056   (eval echo "\"\$as_me:16056: $lt_compile\"" >&5)
    1601216057   (eval "$lt_compile" 2>out/conftest.err)
    1601316058   ac_status=$?
    1601416059   cat out/conftest.err >&5
    16015    echo "$as_me:16015: \$? = $ac_status" >&5
     16060   echo "$as_me:16060: \$? = $ac_status" >&5
    1601616061   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1601716062   then
     
    1821618261   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1821718262   -e 's:$: $lt_compiler_flag:'`
    18218    (eval echo "\"\$as_me:18218: $lt_compile\"" >&5)
     18263   (eval echo "\"\$as_me:18263: $lt_compile\"" >&5)
    1821918264   (eval "$lt_compile" 2>conftest.err)
    1822018265   ac_status=$?
    1822118266   cat conftest.err >&5
    18222    echo "$as_me:18222: \$? = $ac_status" >&5
     18267   echo "$as_me:18267: \$? = $ac_status" >&5
    1822318268   if (exit $ac_status) && test -s "$ac_outfile"; then
    1822418269     # The compiler can only warn and ignore the option if not recognized
     
    1848418529   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1848518530   -e 's:$: $lt_compiler_flag:'`
    18486    (eval echo "\"\$as_me:18486: $lt_compile\"" >&5)
     18531   (eval echo "\"\$as_me:18531: $lt_compile\"" >&5)
    1848718532   (eval "$lt_compile" 2>conftest.err)
    1848818533   ac_status=$?
    1848918534   cat conftest.err >&5
    18490    echo "$as_me:18490: \$? = $ac_status" >&5
     18535   echo "$as_me:18535: \$? = $ac_status" >&5
    1849118536   if (exit $ac_status) && test -s "$ac_outfile"; then
    1849218537     # The compiler can only warn and ignore the option if not recognized
     
    1858818633   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1858918634   -e 's:$: $lt_compiler_flag:'`
    18590    (eval echo "\"\$as_me:18590: $lt_compile\"" >&5)
     18635   (eval echo "\"\$as_me:18635: $lt_compile\"" >&5)
    1859118636   (eval "$lt_compile" 2>out/conftest.err)
    1859218637   ac_status=$?
    1859318638   cat out/conftest.err >&5
    18594    echo "$as_me:18594: \$? = $ac_status" >&5
     18639   echo "$as_me:18639: \$? = $ac_status" >&5
    1859518640   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1859618641   then
     
    2232822373s,@COIN_HAS_PKGCONFIG_TRUE@,$COIN_HAS_PKGCONFIG_TRUE,;t t
    2232922374s,@COIN_HAS_PKGCONFIG_FALSE@,$COIN_HAS_PKGCONFIG_FALSE,;t t
     22375s,@COIN_PKG_CONFIG_PATH@,$COIN_PKG_CONFIG_PATH,;t t
    2233022376s,@DLAMCH_FFLAGS@,$DLAMCH_FFLAGS,;t t
    2233122377s,@EGREP@,$EGREP,;t t
Note: See TracChangeset for help on using the changeset viewer.