Changeset 1469 for ThirdParty/Mumps


Ignore:
Timestamp:
Feb 6, 2010 3:12:35 PM (10 years ago)
Author:
stefan
Message:

add prefix coin to .pc files; changed install dir for libs and doc

Location:
ThirdParty/Mumps/branches/BSPsplit
Files:
4 edited
2 moved

Legend:

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

    r1456 r1469  
    99EXTRA_DIST = get.mumps INSTALL.MUMPS
    1010
    11 thirdpartylibdir = $(prefix)/lib/ThirdParty
     11thirdpartylibdir = $(libdir)/coin/ThirdParty
    1212thirdpartylib_LTLIBRARIES = libcoinmumps.la
    1313
     
    9191  $(MUMPSDIR)/libseq/mpi.h
    9292
    93 addlibsdir = $(prefix)/share/doc/coin/ThirdParty/Mumps
     93addlibsdir = $(datadir)/coin/doc/ThirdParty/Mumps
    9494addlibs_DATA = README mumps_addlibs.txt
    9595
    96 pkgconfiglibdir = $(prefix)/lib/ThirdParty/pkgconfig
    97 pkgconfiglib_DATA = mumps.pc
     96pkgconfiglibdir = $(libdir)/pkgconfig
     97pkgconfiglib_DATA = coinmumps.pc
    9898
    9999########################################################################
  • ThirdParty/Mumps/branches/BSPsplit/Makefile.in

    r1456 r1469  
    5555DIST_COMMON = README $(am__configure_deps) \
    5656        $(srcdir)/../../BuildTools/Makemain.inc $(srcdir)/Makefile.am \
    57         $(srcdir)/Makefile.in $(srcdir)/mumps-uninstalled.pc.in \
    58         $(srcdir)/mumps.pc.in $(srcdir)/mumps_addlibs.txt.in \
     57        $(srcdir)/Makefile.in $(srcdir)/coinmumps-uninstalled.pc.in \
     58        $(srcdir)/coinmumps.pc.in $(srcdir)/mumps_addlibs.txt.in \
    5959        $(thirdpartyinclude_HEADERS) $(top_srcdir)/configure \
    6060        config.guess config.sub depcomp install-sh ltmain.sh missing
     
    7070 configure.lineno configure.status.lineno
    7171mkinstalldirs = $(install_sh) -d
    72 CONFIG_CLEAN_FILES = mumps_addlibs.txt mumps.pc mumps-uninstalled.pc
     72CONFIG_CLEAN_FILES = mumps_addlibs.txt coinmumps.pc \
     73        coinmumps-uninstalled.pc
    7374am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
    7475am__vpath_adj = case $$p in \
     
    291292AUTOMAKE_OPTIONS = foreign
    292293EXTRA_DIST = get.mumps INSTALL.MUMPS $(am__append_1)
    293 thirdpartylibdir = $(prefix)/lib/ThirdParty
     294thirdpartylibdir = $(libdir)/coin/ThirdParty
    294295thirdpartylib_LTLIBRARIES = libcoinmumps.la
    295296nodist_libcoinmumps_la_SOURCES = \
     
    339340  $(MUMPSDIR)/libseq/mpi.h
    340341
    341 addlibsdir = $(prefix)/share/doc/coin/ThirdParty/Mumps
     342addlibsdir = $(datadir)/coin/doc/ThirdParty/Mumps
    342343addlibs_DATA = README mumps_addlibs.txt
    343 pkgconfiglibdir = $(prefix)/lib/ThirdParty/pkgconfig
    344 pkgconfiglib_DATA = mumps.pc
     344pkgconfiglibdir = $(libdir)/pkgconfig
     345pkgconfiglib_DATA = coinmumps.pc
    345346
    346347########################################################################
     
    391392mumps_addlibs.txt: $(top_builddir)/config.status $(srcdir)/mumps_addlibs.txt.in
    392393        cd $(top_builddir) && $(SHELL) ./config.status $@
    393 mumps.pc: $(top_builddir)/config.status $(srcdir)/mumps.pc.in
     394coinmumps.pc: $(top_builddir)/config.status $(srcdir)/coinmumps.pc.in
    394395        cd $(top_builddir) && $(SHELL) ./config.status $@
    395 mumps-uninstalled.pc: $(top_builddir)/config.status $(srcdir)/mumps-uninstalled.pc.in
     396coinmumps-uninstalled.pc: $(top_builddir)/config.status $(srcdir)/coinmumps-uninstalled.pc.in
    396397        cd $(top_builddir) && $(SHELL) ./config.status $@
    397398install-thirdpartylibLTLIBRARIES: $(thirdpartylib_LTLIBRARIES)
  • ThirdParty/Mumps/branches/BSPsplit/coinmumps.pc.in

    r1463 r1469  
    11prefix=@prefix@
    2 libdir=@exec_prefix@/lib/ThirdParty
    3 includedir=${prefix}/include/coin/ThirdParty
     2exec_prefix=@exec_prefix@
     3libdir=@libdir@/coin/ThirdParty
     4includedir=@includedir@/coin/ThirdParty
    45
    56Name: Mumps
  • ThirdParty/Mumps/branches/BSPsplit/configure

    r1460 r1469  
    2369523695
    2369623696    # 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
    23697     if test -d "$prefix"; then
    23698       PKG_CONFIG_PATH="$prefix/lib/pkgconfig:$prefix/lib/ThirdParty/pkgconfig:$prefix/lib/Data/pkgconfig:$PKG_CONFIG_PATH"
     23697    if test -d "${libdir}"; then
     23698      PKG_CONFIG_PATH="${libdir}/pkgconfig:$PKG_CONFIG_PATH"
    2369923699    fi
    2370023700
     
    2370823708   { (exit 1); exit 1; }; }
    2370923709       fi
    23710        PKG_CONFIG_PATH="$withval/lib/pkgconfig:$withval/lib/ThirdParty/pkgconfig:$withval/lib/Data/pkgconfig:$PKG_CONFIG_PATH"
     23710       PKG_CONFIG_PATH="$withval/lib/pkgconfig:$PKG_CONFIG_PATH"
    2371123711
    2371223712fi;
     
    2373523735
    2373623736if test -n "$PKG_CONFIG" ; then
    23737   if $PKG_CONFIG --exists "blas"; then
    23738     BLAS_VERSIONS="`$PKG_CONFIG --modversion blas 2>/dev/null`"
    23739      cflags=`$PKG_CONFIG --cflags "blas" 2>/dev/null`
    23740     # pkg-config cannot handle spaces, so we put CYGPATH_W after -I's after extracting it from pkg-config
     23737  if $PKG_CONFIG --exists "coinblas"; then
     23738    BLAS_VERSIONS="`$PKG_CONFIG --modversion coinblas 2>/dev/null`"
     23739     cflags=`$PKG_CONFIG --cflags "coinblas" 2>/dev/null`
     23740    # pkg-config cannot handle spaces, so CYGPATH_W cannot be put into .pc files
     23741        # thus, we modify the cflags extracted from pkg-config by putting CYGPATH_W behind -I's
    2374123742        # but only do this if is not trivial
    23742     if test "$CYGPATH_W" != echo ; then
    23743           echo "put CYGPATH_W into cflags = $cflags"
    23744           cflags=`echo $cflags | sed -e 's/-I\(.^ *\)/-I\`$CYGPATH_W \1\`/g'`
    23745         else
    23746           echo "do not put CYGPATH_W = $CYGPATH_W in"
     23743    if test "$CYGPATH_W" != "echo" ; then
     23744      # need to put into brackets since otherwise autoconf replaces the brackets in the sed command
     23745          cflags=`echo $cflags | sed -e 's/-I\([^ ]*\)/-I\`${CYGPATH_W} \1\`/g'`
    2374723746        fi
    2374823747    BLAS_CFLAGS="$cflags"
    23749     BLAS_LIBS=`$PKG_CONFIG --libs "blas" 2>/dev/null`
    23750     BLAS_DATA=`$PKG_CONFIG --variable=datadir "blas" 2>/dev/null`
     23748    BLAS_LIBS=`$PKG_CONFIG --libs "coinblas" 2>/dev/null`
     23749    BLAS_DATA=`$PKG_CONFIG --variable=datadir "coinblas" 2>/dev/null`
    2375123750     coin_has_blas=yes
    2375223751        echo "$as_me:$LINENO: result: yes: $BLAS_VERSIONS" >&5
    2375323752echo "${ECHO_T}yes: $BLAS_VERSIONS" >&6
    2375423753        if test $required = 1; then
    23755           REQUIREDPACKAGES="$REQUIREDPACKAGES blas"
     23754          REQUIREDPACKAGES="$REQUIREDPACKAGES coinblas"
    2375623755        fi
    2375723756
    2375823757
    2375923758  else
    23760     BLAS_PKG_ERRORS=`$PKG_CONFIG $pkg_short_errors --errors-to-stdout --print-errors blas`
     23759    BLAS_PKG_ERRORS=`$PKG_CONFIG $pkg_short_errors --errors-to-stdout --print-errors coinblas`
    2376123760      coin_has_blas=notGiven
    2376223761        echo "$as_me:$LINENO: result: not given: $BLAS_PKG_ERRORS" >&5
     
    2393223931
    2393323932    # 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
    23934     if test -d "$prefix"; then
    23935       PKG_CONFIG_PATH="$prefix/lib/pkgconfig:$prefix/lib/ThirdParty/pkgconfig:$prefix/lib/Data/pkgconfig:$PKG_CONFIG_PATH"
     23933    if test -d "${libdir}"; then
     23934      PKG_CONFIG_PATH="${libdir}/pkgconfig:$PKG_CONFIG_PATH"
    2393623935    fi
    2393723936
     
    2394523944   { (exit 1); exit 1; }; }
    2394623945       fi
    23947        PKG_CONFIG_PATH="$withval/lib/pkgconfig:$withval/lib/ThirdParty/pkgconfig:$withval/lib/Data/pkgconfig:$PKG_CONFIG_PATH"
     23946       PKG_CONFIG_PATH="$withval/lib/pkgconfig:$PKG_CONFIG_PATH"
    2394823947
    2394923948fi;
     
    2397223971
    2397323972if test -n "$PKG_CONFIG" ; then
    23974   if $PKG_CONFIG --exists "metis >= 4.0"; then
    23975     METIS_VERSIONS="`$PKG_CONFIG --modversion metis >= 4.0 2>/dev/null`"
    23976      cflags=`$PKG_CONFIG --cflags "metis >= 4.0" 2>/dev/null`
    23977     # pkg-config cannot handle spaces, so we put CYGPATH_W after -I's after extracting it from pkg-config
     23973  if $PKG_CONFIG --exists "coinmetis >= 4.0"; then
     23974    METIS_VERSIONS="`$PKG_CONFIG --modversion coinmetis >= 4.0 2>/dev/null`"
     23975     cflags=`$PKG_CONFIG --cflags "coinmetis >= 4.0" 2>/dev/null`
     23976    # pkg-config cannot handle spaces, so CYGPATH_W cannot be put into .pc files
     23977        # thus, we modify the cflags extracted from pkg-config by putting CYGPATH_W behind -I's
    2397823978        # but only do this if is not trivial
    23979     if test "$CYGPATH_W" != echo ; then
    23980           echo "put CYGPATH_W into cflags = $cflags"
    23981           cflags=`echo $cflags | sed -e 's/-I\(.^ *\)/-I\`$CYGPATH_W \1\`/g'`
    23982         else
    23983           echo "do not put CYGPATH_W = $CYGPATH_W in"
     23979    if test "$CYGPATH_W" != "echo" ; then
     23980      # need to put into brackets since otherwise autoconf replaces the brackets in the sed command
     23981          cflags=`echo $cflags | sed -e 's/-I\([^ ]*\)/-I\`${CYGPATH_W} \1\`/g'`
    2398423982        fi
    2398523983    METIS_CFLAGS="$cflags"
    23986     METIS_LIBS=`$PKG_CONFIG --libs "metis >= 4.0" 2>/dev/null`
    23987     METIS_DATA=`$PKG_CONFIG --variable=datadir "metis >= 4.0" 2>/dev/null`
     23984    METIS_LIBS=`$PKG_CONFIG --libs "coinmetis >= 4.0" 2>/dev/null`
     23985    METIS_DATA=`$PKG_CONFIG --variable=datadir "coinmetis >= 4.0" 2>/dev/null`
    2398823986     coin_has_metis=yes
    2398923987        echo "$as_me:$LINENO: result: yes: $METIS_VERSIONS" >&5
    2399023988echo "${ECHO_T}yes: $METIS_VERSIONS" >&6
    2399123989        if test $required = 1; then
    23992           REQUIREDPACKAGES="$REQUIREDPACKAGES metis >= 4.0"
     23990          REQUIREDPACKAGES="$REQUIREDPACKAGES coinmetis >= 4.0"
    2399323991        fi
    2399423992
    2399523993
    2399623994  else
    23997     METIS_PKG_ERRORS=`$PKG_CONFIG $pkg_short_errors --errors-to-stdout --print-errors metis >= 4.0`
     23995    METIS_PKG_ERRORS=`$PKG_CONFIG $pkg_short_errors --errors-to-stdout --print-errors coinmetis >= 4.0`
    2399823996      coin_has_metis=notGiven
    2399923997        echo "$as_me:$LINENO: result: not given: $METIS_PKG_ERRORS" >&5
     
    2640726405echo "${ECHO_T}$MY_FDEFS" >&6
    2640826406
    26409                                         ac_config_files="$ac_config_files Makefile mumps_addlibs.txt mumps.pc mumps-uninstalled.pc"
     26407                                        ac_config_files="$ac_config_files Makefile mumps_addlibs.txt coinmumps.pc coinmumps-uninstalled.pc"
    2641026408
    2641126409
     
    2713827136  "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
    2713927137  "mumps_addlibs.txt" ) CONFIG_FILES="$CONFIG_FILES mumps_addlibs.txt" ;;
    27140   "mumps.pc" ) CONFIG_FILES="$CONFIG_FILES mumps.pc" ;;
    27141   "mumps-uninstalled.pc" ) CONFIG_FILES="$CONFIG_FILES mumps-uninstalled.pc" ;;
     27138  "coinmumps.pc" ) CONFIG_FILES="$CONFIG_FILES coinmumps.pc" ;;
     27139  "coinmumps-uninstalled.pc" ) CONFIG_FILES="$CONFIG_FILES coinmumps-uninstalled.pc" ;;
    2714227140  "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
    2714327141  *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
  • ThirdParty/Mumps/branches/BSPsplit/configure.ac

    r1460 r1469  
    9797
    9898AC_COIN_HAS_MODULE_BLAS
    99 AC_COIN_HAS_MODULE(Metis, [metis >= 4.0])
     99AC_COIN_HAS_MODULE(Metis, [coinmetis >= 4.0])
    100100
    101101#Fallback if pkgconfig not available or projects do not have .pc files
     
    156156AC_MSG_RESULT([$MY_FDEFS])
    157157
    158 AC_CONFIG_FILES([Makefile mumps_addlibs.txt mumps.pc mumps-uninstalled.pc])
     158AC_CONFIG_FILES([Makefile mumps_addlibs.txt coinmumps.pc coinmumps-uninstalled.pc])
    159159
    160160AC_COIN_FINALIZE
Note: See TracChangeset for help on using the changeset viewer.