Changeset 1542 for ThirdParty/Mumps


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

rerun autotools; improve setup of addlibs file

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

Legend:

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

    r1539 r1542  
    9999
    100100mumps_addlibs.txt : coinmumps.pc
    101         PKG_CONFIG_PATH=.:$(libdir)/pkgconfig:${PKG_CONFIG_PATH} $(PKG_CONFIG) --libs coinmumps > mumps_addlibs.txt
     101        PKG_CONFIG_PATH=.:@COIN_PKG_CONFIG_PATH@ $(PKG_CONFIG) --libs coinmumps > mumps_addlibs.txt
    102102endif
    103103
  • ThirdParty/Mumps/branches/split/Makefile.in

    r1539 r1542  
    164164COIN_HAS_PKGCONFIG_FALSE = @COIN_HAS_PKGCONFIG_FALSE@
    165165COIN_HAS_PKGCONFIG_TRUE = @COIN_HAS_PKGCONFIG_TRUE@
     166COIN_PKG_CONFIG_PATH = @COIN_PKG_CONFIG_PATH@
    166167CPP = @CPP@
    167168CPPFLAGS = @CPPFLAGS@
     
    978979
    979980@COIN_HAS_PKGCONFIG_TRUE@mumps_addlibs.txt : coinmumps.pc
    980 @COIN_HAS_PKGCONFIG_TRUE@       PKG_CONFIG_PATH=.:$(libdir)/pkgconfig:${PKG_CONFIG_PATH} $(PKG_CONFIG) --libs coinmumps > mumps_addlibs.txt
     981@COIN_HAS_PKGCONFIG_TRUE@       PKG_CONFIG_PATH=.:@COIN_PKG_CONFIG_PATH@ $(PKG_CONFIG) --libs coinmumps > mumps_addlibs.txt
    981982
    982983install-doc: $(DocFiles)
  • ThirdParty/Mumps/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 CPP EGREP MY_DEFS 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 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 PKG_CONFIG ac_pt_PKG_CONFIG COIN_HAS_PKGCONFIG_TRUE COIN_HAS_PKGCONFIG_FALSE BLAS_LIBS BLAS_CFLAGS BLAS_DATA REQUIREDPACKAGES COIN_HAS_BLAS_TRUE COIN_HAS_BLAS_FALSE METIS_LIBS METIS_CFLAGS METIS_DATA COIN_HAS_METIS_TRUE COIN_HAS_METIS_FALSE MUMPSDIR MUMPSOBJDIR MUMPSSRCDIR MY_FDEFS 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 CPP EGREP MY_DEFS 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 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 PKG_CONFIG ac_pt_PKG_CONFIG COIN_HAS_PKGCONFIG_TRUE COIN_HAS_PKGCONFIG_FALSE COIN_PKG_CONFIG_PATH BLAS_LIBS BLAS_CFLAGS BLAS_DATA REQUIREDPACKAGES COIN_HAS_BLAS_TRUE COIN_HAS_BLAS_FALSE METIS_LIBS METIS_CFLAGS METIS_DATA COIN_HAS_METIS_TRUE COIN_HAS_METIS_FALSE MUMPSDIR MUMPSOBJDIR MUMPSSRCDIR MY_FDEFS LIBEXT VPATH_DISTCLEANFILES ABSBUILDDIR LIBOBJS LTLIBOBJS'
    476476ac_subst_files=''
    477477
     
    11071107  --with-blas             specify BLAS library (or BUILD for compilation)
    11081108
     1109  --with-coin-instdir     prefix of installation directory for precompiled
     1110                          COIN packages
    11091111  --with-blas-lib linker flags for using module Blas
    11101112  --with-blas-incdir directory with header files for using module Blas
    11111113  --with-blas-datadir directory with data files for using module Blas
    1112   --with-coin-instdir     prefix of installation directory for precompiled
    1113                           COIN packages
    11141114  --with-metis-lib linker flags for using module Metis
    11151115  --with-metis-incdir directory with header files for using module Metis
     
    2166821668
    2166921669
     21670# assemble search path for pkg-config, if we are in a project setup
     21671if test x$coin_projectdir = xyes ; then
     21672  COIN_PKG_CONFIG_PATH="$PKG_CONFIG_PATH"
     21673
     21674  # 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
     21675  # best would actually to use ${libdir}, since .pc files get installed into ${libdir}/pkgconfig,
     21676  # unfortunately, ${libdir} expands to ${exec_prefix}/lib and ${exec_prefix} to ${prefix}...
     21677  if test -d "${prefix}"; then
     21678    COIN_PKG_CONFIG_PATH="${prefix}/lib/pkgconfig:${COIN_PKG_CONFIG_PATH}"
     21679  fi
     21680
     21681
     21682# Check whether --with-coin-instdir or --without-coin-instdir was given.
     21683if test "${with_coin_instdir+set}" = set; then
     21684  withval="$with_coin_instdir"
     21685  if test -d "$withval"; then : ; else
     21686       { { echo "$as_me:$LINENO: error: argument for --with-coin-instdir not a directory" >&5
     21687echo "$as_me: error: argument for --with-coin-instdir not a directory" >&2;}
     21688   { (exit 1); exit 1; }; }
     21689     fi
     21690     COIN_PKG_CONFIG_PATH="$withval/lib/pkgconfig:${COIN_PKG_CONFIG_PATH}"
     21691
     21692fi;
     21693
     21694  # in a classic setup, we want to find uninstalled projects
     21695  # their (relative) location is written to coin_subdirs.txt by the configure in the project base directory
     21696  # unfortunately, if the user set prefix, then we do not know where the project base directory is located
     21697  # 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)
     21698  if test -e ../coin_subdirs.txt ; then
     21699    for i in `cat ../coin_subdirs.txt` ; do
     21700      COIN_PKG_CONFIG_PATH="`cd ../$i; pwd`:${COIN_PKG_CONFIG_PATH}"
     21701    done
     21702  fi
     21703
     21704  if test -e ../../coin_subdirs.txt ; then
     21705    for i in `cat ../../coin_subdirs.txt` ; do
     21706      COIN_PKG_CONFIG_PATH="`cd ../../$i; pwd`:${COIN_PKG_CONFIG_PATH}"
     21707    done
     21708  fi
     21709
     21710
     21711fi
     21712
    2167021713
    2167121714
     
    2370523748if test $coin_has_blas = notGiven; then
    2370623749  if test -n "$PKG_CONFIG" ; then
    23707     # assemble search path for pkg-config
     23750    # set search path for pkg-config
     23751    # need to export variable to be sure that the following pkg-config gets these values
    2370823752    coin_save_PKG_CONFIG_PATH="$PKG_CONFIG_PATH"
    23709 
    23710     # 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
    23711     # best would actually to use ${libdir}, since .pc files get installed into ${libdir}/pkgconfig,
    23712     # unfortunately, ${libdir} expands to ${exec_prefix}/lib and ${exec_prefix} to ${prefix}...
    23713     if test -d "${prefix}"; then
    23714       PKG_CONFIG_PATH="${prefix}/lib/pkgconfig:$PKG_CONFIG_PATH"
    23715     fi
    23716 
    23717 
    23718 # Check whether --with-coin-instdir or --without-coin-instdir was given.
    23719 if test "${with_coin_instdir+set}" = set; then
    23720   withval="$with_coin_instdir"
    23721   if test -d "$withval"; then : ; else
    23722          { { echo "$as_me:$LINENO: error: argument for --with-coin-instdir not a directory" >&5
    23723 echo "$as_me: error: argument for --with-coin-instdir not a directory" >&2;}
    23724    { (exit 1); exit 1; }; }
    23725        fi
    23726        PKG_CONFIG_PATH="$withval/lib/pkgconfig:$PKG_CONFIG_PATH"
    23727 
    23728 fi;
    23729 
    23730     # in a classic setup, we want to find uninstalled projects
    23731     # their (relative) location is written to coin_subdirs.txt by the configure in the project base directory
    23732     # unfortunately, if the user set prefix, then we do not know where the project base directory is located
    23733     # 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)
    23734     if test -e ../coin_subdirs.txt ; then
    23735       for i in `cat ../coin_subdirs.txt` ; do
    23736         PKG_CONFIG_PATH="../$i:$PKG_CONFIG_PATH"
    23737       done
    23738     fi
    23739 
    23740     if test -e ../../coin_subdirs.txt ; then
    23741       for i in `cat ../../coin_subdirs.txt` ; do
    23742         PKG_CONFIG_PATH="../../$i:$PKG_CONFIG_PATH"
    23743       done
    23744     fi
     23753    PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH"
     23754    export PKG_CONFIG_PATH
    2374523755
    2374623756    # let pkg-config do it's magic
    23747     # need to export variable to be sure that the following pkg-config gets these values
    23748     export PKG_CONFIG_PATH
    2374923757
    2375023758
     
    2378623794
    2378723795
     23796    # reset PKG_CONFIG_PATH variable
    2378823797    PKG_CONFIG_PATH="$coin_save_PKG_CONFIG_PATH"
    2378923798  else
     
    2400824017if test $coin_has_metis = notGiven; then
    2400924018  if test -n "$PKG_CONFIG" ; then
    24010     # assemble search path for pkg-config
     24019    # set search path for pkg-config
     24020    # need to export variable to be sure that the following pkg-config gets these values
    2401124021    coin_save_PKG_CONFIG_PATH="$PKG_CONFIG_PATH"
    24012 
    24013     # 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
    24014     # best would actually to use ${libdir}, since .pc files get installed into ${libdir}/pkgconfig,
    24015     # unfortunately, ${libdir} expands to ${exec_prefix}/lib and ${exec_prefix} to ${prefix}...
    24016     if test -d "${prefix}"; then
    24017       PKG_CONFIG_PATH="${prefix}/lib/pkgconfig:$PKG_CONFIG_PATH"
    24018     fi
    24019 
    24020 
    24021 # Check whether --with-coin-instdir or --without-coin-instdir was given.
    24022 if test "${with_coin_instdir+set}" = set; then
    24023   withval="$with_coin_instdir"
    24024   if test -d "$withval"; then : ; else
    24025          { { echo "$as_me:$LINENO: error: argument for --with-coin-instdir not a directory" >&5
    24026 echo "$as_me: error: argument for --with-coin-instdir not a directory" >&2;}
    24027    { (exit 1); exit 1; }; }
    24028        fi
    24029        PKG_CONFIG_PATH="$withval/lib/pkgconfig:$PKG_CONFIG_PATH"
    24030 
    24031 fi;
    24032 
    24033     # in a classic setup, we want to find uninstalled projects
    24034     # their (relative) location is written to coin_subdirs.txt by the configure in the project base directory
    24035     # unfortunately, if the user set prefix, then we do not know where the project base directory is located
    24036     # 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)
    24037     if test -e ../coin_subdirs.txt ; then
    24038       for i in `cat ../coin_subdirs.txt` ; do
    24039         PKG_CONFIG_PATH="../$i:$PKG_CONFIG_PATH"
    24040       done
    24041     fi
    24042 
    24043     if test -e ../../coin_subdirs.txt ; then
    24044       for i in `cat ../../coin_subdirs.txt` ; do
    24045         PKG_CONFIG_PATH="../../$i:$PKG_CONFIG_PATH"
    24046       done
    24047     fi
     24022    PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH"
     24023    export PKG_CONFIG_PATH
    2404824024
    2404924025    # let pkg-config do it's magic
    24050     # need to export variable to be sure that the following pkg-config gets these values
    24051     export PKG_CONFIG_PATH
    2405224026
    2405324027
     
    2408924063
    2409024064
     24065    # reset PKG_CONFIG_PATH variable
    2409124066    PKG_CONFIG_PATH="$coin_save_PKG_CONFIG_PATH"
    2409224067  else
     
    2530025275s,@COIN_HAS_PKGCONFIG_TRUE@,$COIN_HAS_PKGCONFIG_TRUE,;t t
    2530125276s,@COIN_HAS_PKGCONFIG_FALSE@,$COIN_HAS_PKGCONFIG_FALSE,;t t
     25277s,@COIN_PKG_CONFIG_PATH@,$COIN_PKG_CONFIG_PATH,;t t
    2530225278s,@BLAS_LIBS@,$BLAS_LIBS,;t t
    2530325279s,@BLAS_CFLAGS@,$BLAS_CFLAGS,;t t
Note: See TracChangeset for help on using the changeset viewer.