Changeset 1453


Ignore:
Timestamp:
Nov 29, 2009 12:12:56 PM (11 years ago)
Author:
stefan
Message:

fix Requires field in .pc files; rerun autotools

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

Legend:

Unmodified
Added
Removed
  • ThirdParty/Mumps/branches/BSPsplit/configure

    r1449 r1453  
    2364923649
    2365023650
     23651required=1
     23652
     23653# execute third argument that can be used to overwrite flags like 'required'
     23654
     23655
    2365123656#check if user provided LIBS, CFLAGS, and DATA for module
    2365223657if test $coin_has_blas != skipping; then
     
    2365823663  coin_has_blas=yes
    2365923664       BLAS_LIBS="$withval"
    23660        ADDLIBS="$ADDLIBS $withval"
     23665       if test $required = 1; then
     23666         ADDLIBS="$ADDLIBS $withval"
     23667       fi
    2366123668
    2366223669fi;
     
    2368323690    # assemble search path for pkg-config
    2368423691    coin_save_PKG_CONFIG_PATH="$PKG_CONFIG_PATH"
     23692
     23693    # 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
     23694    if test -d "$prefix"; then
     23695      PKG_CONFIG_PATH="$prefix/lib/pkgconfig:$prefix/lib/ThirdParty/pkgconfig:$prefix/lib/Data/pkgconfig:$PKG_CONFIG_PATH"
     23696    fi
    2368523697
    2368623698
     
    2369323705   { (exit 1); exit 1; }; }
    2369423706       fi
    23695        PKG_CONFIG_PATH="$withval/lib/pkgconfig:$withval/lib/ThirdParty/pkgconfig:$withval/lib/Data/pkgconfig:$PKG_CONFIG_PATH",
     23707       PKG_CONFIG_PATH="$withval/lib/pkgconfig:$withval/lib/ThirdParty/pkgconfig:$withval/lib/Data/pkgconfig:$PKG_CONFIG_PATH"
    2369623708
    2369723709fi;
    2369823710
    23699     if test -e ${prefix}/coin_subdirs.txt ; then
    23700       for i in `cat ${prefix}/coin_subdirs.txt` ; do
    23701         PKG_CONFIG_PATH="${prefix}/$i:$PKG_CONFIG_PATH"
     23711    # in a classic setup, we want to find uninstalled projects
     23712    # their (relative) location is written to coin_subdirs.txt by the configure in the project base directory
     23713    # unfortunately, if the user set prefix, then we do not know where the project base directory is located
     23714    # 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)
     23715    if test -e ../coin_subdirs.txt ; then
     23716      for i in `cat ../coin_subdirs.txt` ; do
     23717        PKG_CONFIG_PATH="../$i:$PKG_CONFIG_PATH"
     23718      done
     23719    fi
     23720
     23721    if test -e ../../coin_subdirs.txt ; then
     23722      for i in `cat ../../coin_subdirs.txt` ; do
     23723        PKG_CONFIG_PATH="../../$i:$PKG_CONFIG_PATH"
    2370223724      done
    2370323725    fi
     
    2371823740        echo "$as_me:$LINENO: result: yes: $BLAS_VERSIONS" >&5
    2371923741echo "${ECHO_T}yes: $BLAS_VERSIONS" >&6
    23720         REQUIREDPACKAGES="$REQUIREDPACKAGES blas"
     23742        if test $required = 1; then
     23743          REQUIREDPACKAGES="$REQUIREDPACKAGES blas"
     23744        fi
    2372123745
    2372223746
     
    2385323877
    2385423878
     23879required=1
     23880
     23881# execute third argument that can be used to overwrite flags like 'required'
     23882
     23883
    2385523884#check if user provided LIBS, CFLAGS, and DATA for module
    2385623885if test $coin_has_metis != skipping; then
     
    2386223891  coin_has_metis=yes
    2386323892       METIS_LIBS="$withval"
    23864        ADDLIBS="$ADDLIBS $withval"
     23893       if test $required = 1; then
     23894         ADDLIBS="$ADDLIBS $withval"
     23895       fi
    2386523896
    2386623897fi;
     
    2388723918    # assemble search path for pkg-config
    2388823919    coin_save_PKG_CONFIG_PATH="$PKG_CONFIG_PATH"
     23920
     23921    # 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
     23922    if test -d "$prefix"; then
     23923      PKG_CONFIG_PATH="$prefix/lib/pkgconfig:$prefix/lib/ThirdParty/pkgconfig:$prefix/lib/Data/pkgconfig:$PKG_CONFIG_PATH"
     23924    fi
    2388923925
    2389023926
     
    2389723933   { (exit 1); exit 1; }; }
    2389823934       fi
    23899        PKG_CONFIG_PATH="$withval/lib/pkgconfig:$withval/lib/ThirdParty/pkgconfig:$withval/lib/Data/pkgconfig:$PKG_CONFIG_PATH",
     23935       PKG_CONFIG_PATH="$withval/lib/pkgconfig:$withval/lib/ThirdParty/pkgconfig:$withval/lib/Data/pkgconfig:$PKG_CONFIG_PATH"
    2390023936
    2390123937fi;
    2390223938
    23903     if test -e ${prefix}/coin_subdirs.txt ; then
    23904       for i in `cat ${prefix}/coin_subdirs.txt` ; do
    23905         PKG_CONFIG_PATH="${prefix}/$i:$PKG_CONFIG_PATH"
     23939    # in a classic setup, we want to find uninstalled projects
     23940    # their (relative) location is written to coin_subdirs.txt by the configure in the project base directory
     23941    # unfortunately, if the user set prefix, then we do not know where the project base directory is located
     23942    # 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)
     23943    if test -e ../coin_subdirs.txt ; then
     23944      for i in `cat ../coin_subdirs.txt` ; do
     23945        PKG_CONFIG_PATH="../$i:$PKG_CONFIG_PATH"
     23946      done
     23947    fi
     23948
     23949    if test -e ../../coin_subdirs.txt ; then
     23950      for i in `cat ../../coin_subdirs.txt` ; do
     23951        PKG_CONFIG_PATH="../../$i:$PKG_CONFIG_PATH"
    2390623952      done
    2390723953    fi
     
    2392223968        echo "$as_me:$LINENO: result: yes: $METIS_VERSIONS" >&5
    2392323969echo "${ECHO_T}yes: $METIS_VERSIONS" >&6
    23924         REQUIREDPACKAGES="$REQUIREDPACKAGES metis >= 4.0"
     23970        if test $required = 1; then
     23971          REQUIREDPACKAGES="$REQUIREDPACKAGES metis >= 4.0"
     23972        fi
    2392523973
    2392623974
  • ThirdParty/Mumps/branches/BSPsplit/mumps-uninstalled.pc.in

    r1446 r1453  
    77Libs: -L${libdir} -lcoinmumps @ADDLIBS@
    88Cflags: -I@abs_source_dir@/libseq -I@abs_source_dir@/include
    9 Required: @REQUIREDPACKAGES@
     9Requires: @REQUIREDPACKAGES@
  • ThirdParty/Mumps/branches/BSPsplit/mumps.pc.in

    r1435 r1453  
    88Libs: -L${libdir} -lcoinmumps @ADDLIBS@
    99Cflags: -I${includedir}
    10 Required: @REQUIREDPACKAGES@
     10Requires: @REQUIREDPACKAGES@
Note: See TracChangeset for help on using the changeset viewer.