Changeset 1510 for stable


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

install libs and doc to different location; names of pc files for data and thirdparty projects changed

Location:
stable/BSPsplit
Files:
9 edited

Legend:

Unmodified
Added
Removed
  • stable/BSPsplit/Clp/Makefile.am

    r1465 r1510  
    9595########################################################################
    9696
    97 addlibsfile = clp_addlibs.txt
    98 addlibsdir = $(prefix)/share/doc/coin/$(PACKAGE_NAME)/
     97addlibsdir = $(datadir)/coin/doc/Clp
     98addlibs_DATA = clp_addlibs.txt
    9999
    100 install-exec-local: install-doc
    101         $(install_sh_DATA) $(addlibsfile) $(DESTDIR)$(addlibsdir)/$(addlibsfile)
    102 
    103 uninstall-local: uninstall-doc
    104         rm -f $(DESTDIR)$(addlibsdir)/$(addlibsfile)
    105 
    106 pkgconfiglibdir = $(prefix)/lib/pkgconfig
     100pkgconfiglibdir = $(libdir)/pkgconfig
    107101pkgconfiglib_DATA = clp.pc
    108102
  • stable/BSPsplit/Clp/Makefile.in

    r1465 r1510  
    9595  esac;
    9696am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
    97 am__installdirs = "$(DESTDIR)$(pkgconfiglibdir)"
     97am__installdirs = "$(DESTDIR)$(addlibsdir)" \
     98        "$(DESTDIR)$(pkgconfiglibdir)"
     99addlibsDATA_INSTALL = $(INSTALL_DATA)
    98100pkgconfiglibDATA_INSTALL = $(INSTALL_DATA)
    99 DATA = $(pkgconfiglib_DATA)
     101DATA = $(addlibs_DATA) $(pkgconfiglib_DATA)
    100102ETAGS = etags
    101103CTAGS = ctags
     
    304306#                  Installation of the addlibs file                    #
    305307########################################################################
    306 addlibsfile = clp_addlibs.txt
    307 addlibsdir = $(prefix)/share/doc/coin/$(PACKAGE_NAME)/
    308 pkgconfiglibdir = $(prefix)/lib/pkgconfig
     308addlibsdir = $(datadir)/coin/doc/Clp
     309addlibs_DATA = clp_addlibs.txt
     310pkgconfiglibdir = $(libdir)/pkgconfig
    309311pkgconfiglib_DATA = clp.pc
    310312
     
    388390        -rm -f libtool
    389391uninstall-info-am:
     392install-addlibsDATA: $(addlibs_DATA)
     393        @$(NORMAL_INSTALL)
     394        test -z "$(addlibsdir)" || $(mkdir_p) "$(DESTDIR)$(addlibsdir)"
     395        @list='$(addlibs_DATA)'; for p in $$list; do \
     396          if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
     397          f=$(am__strip_dir) \
     398          echo " $(addlibsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(addlibsdir)/$$f'"; \
     399          $(addlibsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(addlibsdir)/$$f"; \
     400        done
     401
     402uninstall-addlibsDATA:
     403        @$(NORMAL_UNINSTALL)
     404        @list='$(addlibs_DATA)'; for p in $$list; do \
     405          f=$(am__strip_dir) \
     406          echo " rm -f '$(DESTDIR)$(addlibsdir)/$$f'"; \
     407          rm -f "$(DESTDIR)$(addlibsdir)/$$f"; \
     408        done
    390409install-pkgconfiglibDATA: $(pkgconfiglib_DATA)
    391410        @$(NORMAL_INSTALL)
     
    685704installdirs: installdirs-recursive
    686705installdirs-am:
    687         for dir in "$(DESTDIR)$(pkgconfiglibdir)"; do \
     706        for dir in "$(DESTDIR)$(addlibsdir)" "$(DESTDIR)$(pkgconfiglibdir)"; do \
    688707          test -z "$$dir" || $(mkdir_p) "$$dir"; \
    689708        done
     
    733752info-am:
    734753
    735 install-data-am: install-pkgconfiglibDATA
    736 
    737 install-exec-am: install-exec-local
     754install-data-am: install-addlibsDATA install-pkgconfiglibDATA
     755
     756install-exec-am:
    738757
    739758install-info: install-info-recursive
     
    761780ps-am:
    762781
    763 uninstall-am: uninstall-info-am uninstall-local \
     782uninstall-am: uninstall-addlibsDATA uninstall-info-am \
    764783        uninstall-pkgconfiglibDATA
    765784
     
    773792        distclean-local distclean-recursive distclean-tags \
    774793        distcleancheck distdir distuninstallcheck dvi dvi-am html \
    775         html-am info info-am install install-am install-data \
    776         install-data-am install-exec install-exec-am \
    777         install-exec-local install-info install-info-am install-man \
     794        html-am info info-am install install-addlibsDATA install-am \
     795        install-data install-data-am install-exec install-exec-am \
     796        install-info install-info-am install-man \
    778797        install-pkgconfiglibDATA install-strip installcheck \
    779798        installcheck-am installdirs installdirs-am maintainer-clean \
     
    781800        mostlyclean mostlyclean-generic mostlyclean-libtool \
    782801        mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
    783         uninstall uninstall-am uninstall-info-am uninstall-local \
     802        uninstall uninstall-addlibsDATA uninstall-am uninstall-info-am \
    784803        uninstall-pkgconfiglibDATA
    785804
     
    801820
    802821.PHONY: test unitTest
    803 
    804 install-exec-local: install-doc
    805         $(install_sh_DATA) $(addlibsfile) $(DESTDIR)$(addlibsdir)/$(addlibsfile)
    806 
    807 uninstall-local: uninstall-doc
    808         rm -f $(DESTDIR)$(addlibsdir)/$(addlibsfile)
    809822
    810823install-doc: $(DocFiles)
  • stable/BSPsplit/Clp/clp.pc.in

    r1465 r1510  
    11prefix=@prefix@
    2 libdir=@exec_prefix@/lib
    3 includedir=${prefix}/include/coin
     2exec_prefix=@exec_prefix@
     3libdir=@libdir@/coin
     4includedir=@includedir@/coin
    45
    56Name: CLP
  • stable/BSPsplit/Clp/configure

    r1488 r1510  
    2062320623
    2062420624    # 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
    20625     if test -d "$prefix"; then
    20626       PKG_CONFIG_PATH="$prefix/lib/pkgconfig:$prefix/lib/ThirdParty/pkgconfig:$prefix/lib/Data/pkgconfig:$PKG_CONFIG_PATH"
     20625    # best would actually to use ${libdir}, since .pc files get installed into ${libdir}/pkgconfig,
     20626    # unfortunately, ${libdir} expands to ${exec_prefix}/lib and ${exec_prefix} to ${prefix}...
     20627    if test -d "${prefix}"; then
     20628      PKG_CONFIG_PATH="${prefix}/lib/pkgconfig:$PKG_CONFIG_PATH"
    2062720629    fi
    2062820630
     
    2063620638   { (exit 1); exit 1; }; }
    2063720639       fi
    20638        PKG_CONFIG_PATH="$withval/lib/pkgconfig:$withval/lib/ThirdParty/pkgconfig:$withval/lib/Data/pkgconfig:$PKG_CONFIG_PATH"
     20640       PKG_CONFIG_PATH="$withval/lib/pkgconfig:$PKG_CONFIG_PATH"
    2063920641
    2064020642fi;
     
    2081220814
    2081320815    # 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
    20814     if test -d "$prefix"; then
    20815       PKG_CONFIG_PATH="$prefix/lib/pkgconfig:$prefix/lib/ThirdParty/pkgconfig:$prefix/lib/Data/pkgconfig:$PKG_CONFIG_PATH"
     20816    # best would actually to use ${libdir}, since .pc files get installed into ${libdir}/pkgconfig,
     20817    # unfortunately, ${libdir} expands to ${exec_prefix}/lib and ${exec_prefix} to ${prefix}...
     20818    if test -d "${prefix}"; then
     20819      PKG_CONFIG_PATH="${prefix}/lib/pkgconfig:$PKG_CONFIG_PATH"
    2081620820    fi
    2081720821
     
    2082520829   { (exit 1); exit 1; }; }
    2082620830       fi
    20827        PKG_CONFIG_PATH="$withval/lib/pkgconfig:$withval/lib/ThirdParty/pkgconfig:$withval/lib/Data/pkgconfig:$PKG_CONFIG_PATH"
     20831       PKG_CONFIG_PATH="$withval/lib/pkgconfig:$PKG_CONFIG_PATH"
    2082820832
    2082920833fi;
     
    2085220856
    2085320857if test -n "$PKG_CONFIG" ; then
    20854   if $PKG_CONFIG --exists "sample"; then
    20855     SAMPLE_VERSIONS="`$PKG_CONFIG --modversion sample 2>/dev/null`"
    20856      cflags=`$PKG_CONFIG --cflags "sample" 2>/dev/null`
     20858  if $PKG_CONFIG --exists "coindatasample"; then
     20859    SAMPLE_VERSIONS="`$PKG_CONFIG --modversion coindatasample 2>/dev/null`"
     20860     cflags=`$PKG_CONFIG --cflags "coindatasample" 2>/dev/null`
    2085720861    # pkg-config cannot handle spaces, so CYGPATH_W cannot be put into .pc files
    2085820862        # thus, we modify the cflags extracted from pkg-config by putting CYGPATH_W behind -I's
     
    2086320867        fi
    2086420868    SAMPLE_CFLAGS="$cflags"
    20865     SAMPLE_LIBS=`$PKG_CONFIG --libs "sample" 2>/dev/null`
    20866     SAMPLE_DATA=`$PKG_CONFIG --variable=datadir "sample" 2>/dev/null`
     20869    SAMPLE_LIBS=`$PKG_CONFIG --libs "coindatasample" 2>/dev/null`
     20870    SAMPLE_DATA=`$PKG_CONFIG --variable=datadir "coindatasample" 2>/dev/null`
    2086720871     coin_has_sample=yes
    2086820872        echo "$as_me:$LINENO: result: yes: $SAMPLE_VERSIONS" >&5
    2086920873echo "${ECHO_T}yes: $SAMPLE_VERSIONS" >&6
    2087020874        if test $required = 1; then
    20871           REQUIREDPACKAGES="$REQUIREDPACKAGES sample"
     20875          REQUIREDPACKAGES="$REQUIREDPACKAGES coindatasample"
    2087220876        fi
    2087320877
    2087420878
    2087520879  else
    20876     SAMPLE_PKG_ERRORS=`$PKG_CONFIG $pkg_short_errors --errors-to-stdout --print-errors sample`
     20880    SAMPLE_PKG_ERRORS=`$PKG_CONFIG $pkg_short_errors --errors-to-stdout --print-errors coindatasample`
    2087720881      coin_has_sample=notGiven
    2087820882        echo "$as_me:$LINENO: result: not given: $SAMPLE_PKG_ERRORS" >&5
     
    2100121005
    2100221006    # 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
    21003     if test -d "$prefix"; then
    21004       PKG_CONFIG_PATH="$prefix/lib/pkgconfig:$prefix/lib/ThirdParty/pkgconfig:$prefix/lib/Data/pkgconfig:$PKG_CONFIG_PATH"
     21007    # best would actually to use ${libdir}, since .pc files get installed into ${libdir}/pkgconfig,
     21008    # unfortunately, ${libdir} expands to ${exec_prefix}/lib and ${exec_prefix} to ${prefix}...
     21009    if test -d "${prefix}"; then
     21010      PKG_CONFIG_PATH="${prefix}/lib/pkgconfig:$PKG_CONFIG_PATH"
    2100521011    fi
    2100621012
     
    2101421020   { (exit 1); exit 1; }; }
    2101521021       fi
    21016        PKG_CONFIG_PATH="$withval/lib/pkgconfig:$withval/lib/ThirdParty/pkgconfig:$withval/lib/Data/pkgconfig:$PKG_CONFIG_PATH"
     21022       PKG_CONFIG_PATH="$withval/lib/pkgconfig:$PKG_CONFIG_PATH"
    2101721023
    2101821024fi;
     
    2104121047
    2104221048if test -n "$PKG_CONFIG" ; then
    21043   if $PKG_CONFIG --exists "netlib"; then
    21044     NETLIB_VERSIONS="`$PKG_CONFIG --modversion netlib 2>/dev/null`"
    21045      cflags=`$PKG_CONFIG --cflags "netlib" 2>/dev/null`
     21049  if $PKG_CONFIG --exists "coindatanetlib"; then
     21050    NETLIB_VERSIONS="`$PKG_CONFIG --modversion coindatanetlib 2>/dev/null`"
     21051     cflags=`$PKG_CONFIG --cflags "coindatanetlib" 2>/dev/null`
    2104621052    # pkg-config cannot handle spaces, so CYGPATH_W cannot be put into .pc files
    2104721053        # thus, we modify the cflags extracted from pkg-config by putting CYGPATH_W behind -I's
     
    2105221058        fi
    2105321059    NETLIB_CFLAGS="$cflags"
    21054     NETLIB_LIBS=`$PKG_CONFIG --libs "netlib" 2>/dev/null`
    21055     NETLIB_DATA=`$PKG_CONFIG --variable=datadir "netlib" 2>/dev/null`
     21060    NETLIB_LIBS=`$PKG_CONFIG --libs "coindatanetlib" 2>/dev/null`
     21061    NETLIB_DATA=`$PKG_CONFIG --variable=datadir "coindatanetlib" 2>/dev/null`
    2105621062     coin_has_netlib=yes
    2105721063        echo "$as_me:$LINENO: result: yes: $NETLIB_VERSIONS" >&5
    2105821064echo "${ECHO_T}yes: $NETLIB_VERSIONS" >&6
    2105921065        if test $required = 1; then
    21060           REQUIREDPACKAGES="$REQUIREDPACKAGES netlib"
     21066          REQUIREDPACKAGES="$REQUIREDPACKAGES coindatanetlib"
    2106121067        fi
    2106221068
    2106321069
    2106421070  else
    21065     NETLIB_PKG_ERRORS=`$PKG_CONFIG $pkg_short_errors --errors-to-stdout --print-errors netlib`
     21071    NETLIB_PKG_ERRORS=`$PKG_CONFIG $pkg_short_errors --errors-to-stdout --print-errors coindatanetlib`
    2106621072      coin_has_netlib=notGiven
    2106721073        echo "$as_me:$LINENO: result: not given: $NETLIB_PKG_ERRORS" >&5
  • stable/BSPsplit/Clp/configure.ac

    r1487 r1510  
    6060#AC_COIN_HAS_MODULE_LAPACK
    6161AC_COIN_HAS_MODULE(CoinUtils,  [coinutils = 2.5BSPsplit])
    62 AC_COIN_HAS_MODULE(Sample,     [sample], [required=0])
    63 AC_COIN_HAS_MODULE(Netlib,     [netlib], [required=0])
     62AC_COIN_HAS_MODULE(Sample,     [coindatasample], [required=0])
     63AC_COIN_HAS_MODULE(Netlib,     [coindatanetlib], [required=0])
    6464
    6565if test "$coin_has_coinutils" != yes ; then
  • stable/BSPsplit/Clp/src/Makefile.am

    r1465 r1510  
    1515# Name of the library compiled in this directory.  We want it to be installed
    1616# in the 'lib' directory
    17 lib_LTLIBRARIES = libClp.la
     17coinlibdir = ${libdir}/coin
     18coinlib_LTLIBRARIES = libClp.la
    1819
    1920# List all source files for this library, including headers
     
    99100# library is found (in the lib install directory) when we are using dynamic
    100101# libraries.
    101 clp_LDFLAGS = -rpath $(libdir)
     102clp_LDFLAGS = -rpath $(libdir)/coin
    102103
    103104########################################################################
  • stable/BSPsplit/Clp/src/Makefile.in

    r1465 r1510  
    6363  esac;
    6464am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
    65 am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \
     65am__installdirs = "$(DESTDIR)$(coinlibdir)" "$(DESTDIR)$(bindir)" \
    6666        "$(DESTDIR)$(includecoindir)"
    67 libLTLIBRARIES_INSTALL = $(INSTALL)
    68 LTLIBRARIES = $(lib_LTLIBRARIES)
     67coinlibLTLIBRARIES_INSTALL = $(INSTALL)
     68LTLIBRARIES = $(coinlib_LTLIBRARIES)
    6969libClp_la_LIBADD =
    7070am_libClp_la_OBJECTS = ClpCholeskyBase.lo ClpCholeskyDense.lo \
     
    285285# Name of the library compiled in this directory.  We want it to be installed
    286286# in the 'lib' directory
    287 lib_LTLIBRARIES = libClp.la
     287coinlibdir = ${libdir}/coin
     288coinlib_LTLIBRARIES = libClp.la
    288289
    289290# List all source files for this library, including headers
     
    361362# library is found (in the lib install directory) when we are using dynamic
    362363# libraries.
    363 clp_LDFLAGS = -rpath $(libdir)
     364clp_LDFLAGS = -rpath $(libdir)/coin
    364365
    365366########################################################################
     
    467468$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
    468469        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
    469 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
     470install-coinlibLTLIBRARIES: $(coinlib_LTLIBRARIES)
    470471        @$(NORMAL_INSTALL)
    471         test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
    472         @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
     472        test -z "$(coinlibdir)" || $(mkdir_p) "$(DESTDIR)$(coinlibdir)"
     473        @list='$(coinlib_LTLIBRARIES)'; for p in $$list; do \
    473474          if test -f $$p; then \
    474475            f=$(am__strip_dir) \
    475             echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
    476             $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
     476            echo " $(LIBTOOL) --mode=install $(coinlibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(coinlibdir)/$$f'"; \
     477            $(LIBTOOL) --mode=install $(coinlibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(coinlibdir)/$$f"; \
    477478          else :; fi; \
    478479        done
    479480
    480 uninstall-libLTLIBRARIES:
     481uninstall-coinlibLTLIBRARIES:
    481482        @$(NORMAL_UNINSTALL)
    482         @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
     483        @set -x; list='$(coinlib_LTLIBRARIES)'; for p in $$list; do \
    483484          p=$(am__strip_dir) \
    484           echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
    485           $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
    486         done
    487 
    488 clean-libLTLIBRARIES:
    489         -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
    490         @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
     485          echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(coinlibdir)/$$p'"; \
     486          $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(coinlibdir)/$$p"; \
     487        done
     488
     489clean-coinlibLTLIBRARIES:
     490        -test -z "$(coinlib_LTLIBRARIES)" || rm -f $(coinlib_LTLIBRARIES)
     491        @list='$(coinlib_LTLIBRARIES)'; for p in $$list; do \
    491492          dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
    492493          test "$$dir" != "$$p" || dir=.; \
     
    495496        done
    496497libClp.la: $(libClp_la_OBJECTS) $(libClp_la_DEPENDENCIES)
    497         $(CXXLINK) -rpath $(libdir) $(libClp_la_LDFLAGS) $(libClp_la_OBJECTS) $(libClp_la_LIBADD) $(LIBS)
     498        $(CXXLINK) -rpath $(coinlibdir) $(libClp_la_LDFLAGS) $(libClp_la_OBJECTS) $(libClp_la_LIBADD) $(LIBS)
    498499install-binPROGRAMS: $(bin_PROGRAMS)
    499500        @$(NORMAL_INSTALL)
     
    717718check: check-am
    718719all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS)
    719 install-binPROGRAMS: install-libLTLIBRARIES
    720 
    721720installdirs:
    722         for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(includecoindir)"; do \
     721        for dir in "$(DESTDIR)$(coinlibdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(includecoindir)"; do \
    723722          test -z "$$dir" || $(mkdir_p) "$$dir"; \
    724723        done
     
    749748clean: clean-am
    750749
    751 clean-am: clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \
     750clean-am: clean-binPROGRAMS clean-coinlibLTLIBRARIES clean-generic \
    752751        clean-libtool mostlyclean-am
    753752
     
    768767info-am:
    769768
    770 install-data-am: install-includecoinHEADERS
    771 
    772 install-exec-am: install-binPROGRAMS install-exec-local \
    773         install-libLTLIBRARIES
     769install-data-am: install-coinlibLTLIBRARIES install-includecoinHEADERS
     770
     771install-exec-am: install-binPROGRAMS install-exec-local
    774772
    775773install-info: install-info-am
     
    797795ps-am:
    798796
    799 uninstall-am: uninstall-binPROGRAMS uninstall-includecoinHEADERS \
    800         uninstall-info-am uninstall-libLTLIBRARIES uninstall-local
     797uninstall-am: uninstall-binPROGRAMS uninstall-coinlibLTLIBRARIES \
     798        uninstall-includecoinHEADERS uninstall-info-am uninstall-local
    801799
    802800.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
    803         clean-generic clean-libLTLIBRARIES clean-libtool ctags \
     801        clean-coinlibLTLIBRARIES clean-generic clean-libtool ctags \
    804802        distclean distclean-compile distclean-generic \
    805803        distclean-libtool distclean-tags distdir dvi dvi-am html \
    806804        html-am info info-am install install-am install-binPROGRAMS \
    807         install-data install-data-am install-exec install-exec-am \
    808         install-exec-local install-includecoinHEADERS install-info \
    809         install-info-am install-libLTLIBRARIES install-man \
    810         install-strip installcheck installcheck-am installdirs \
    811         maintainer-clean maintainer-clean-generic mostlyclean \
    812         mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
    813         pdf pdf-am ps ps-am tags uninstall uninstall-am \
    814         uninstall-binPROGRAMS uninstall-includecoinHEADERS \
    815         uninstall-info-am uninstall-libLTLIBRARIES uninstall-local
     805        install-coinlibLTLIBRARIES install-data install-data-am \
     806        install-exec install-exec-am install-exec-local \
     807        install-includecoinHEADERS install-info install-info-am \
     808        install-man install-strip installcheck installcheck-am \
     809        installdirs maintainer-clean maintainer-clean-generic \
     810        mostlyclean mostlyclean-compile mostlyclean-generic \
     811        mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
     812        uninstall-am uninstall-binPROGRAMS \
     813        uninstall-coinlibLTLIBRARIES uninstall-includecoinHEADERS \
     814        uninstall-info-am uninstall-local
    816815
    817816
  • stable/BSPsplit/configure

    r1467 r1510  
    2096920969
    2097020970coin_has_blas=notGiven
     20971coin_have_project_dir=no
    2097120972
    2097220973# check if user wants to skip project in any case
     
    2098620987  if test $PACKAGE_TARNAME = blas; then
    2098720988    coin_has_blas=.
     20989    coin_have_project_dir=yes
    2098820990  fi
    2098920991
     
    2101821020    # 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
    2101921021    if test -d "$prefix"; then
    21020       PKG_CONFIG_PATH="$prefix/lib/ThirdParty/pkgconfig:$PKG_CONFIG_PATH"
     21022      PKG_CONFIG_PATH="$prefix/lib/pkgconfig:$PKG_CONFIG_PATH"
    2102121023    fi
    2102221024
     
    2103021032   { (exit 1); exit 1; }; }
    2103121033       fi
    21032        PKG_CONFIG_PATH="$withval/lib/ThirdParty/pkgconfig:$PKG_CONFIG_PATH"
     21034       PKG_CONFIG_PATH="$withval/lib/pkgconfig:$PKG_CONFIG_PATH"
    2103321035
    2103421036fi;
     
    2103921041
    2104021042if test -n "$PKG_CONFIG" ; then
    21041   if $PKG_CONFIG --exists "blas"; then
    21042     BLAS_VERSION=`$PKG_CONFIG --modversion "blas" 2>/dev/null`
    21043     coin_has_blas="$BLAS_VERSION"
     21043  if $PKG_CONFIG --exists "coinblas"; then
     21044    COINBLAS_VERSION=`$PKG_CONFIG --modversion "coinblas" 2>/dev/null`
     21045    coin_has_blas="$COINBLAS_VERSION"
    2104421046  else
    21045     BLAS_PKG_ERRORS=`$PKG_CONFIG $pkg_short_errors --errors-to-stdout --print-errors "blas"`
    21046 
    21047   fi
    21048 else
    21049   { { echo "$as_me:$LINENO: error: \"Cannot check for existance of module Blas without pkg-config\"" >&5
    21050 echo "$as_me: error: \"Cannot check for existance of module Blas without pkg-config\"" >&2;}
     21047    COINBLAS_PKG_ERRORS=`$PKG_CONFIG $pkg_short_errors --errors-to-stdout --print-errors "coinblas"`
     21048
     21049  fi
     21050else
     21051  { { echo "$as_me:$LINENO: error: \"Cannot check for existance of module coinblas without pkg-config\"" >&5
     21052echo "$as_me: error: \"Cannot check for existance of module coinblas without pkg-config\"" >&2;}
    2105121053   { (exit 1); exit 1; }; }
    2105221054fi
     
    2106021062if test "$coin_has_blas" = notGiven; then
    2106121063  if test -d $srcdir/ThirdParty/Blas; then
    21062     coin_pkg_is_here=no
    2106321064    for i in $srcdir/ThirdParty/Blas/daxpy.f; do
    2106421065         if test -r $i; then
    21065            coin_pkg_is_here=yes
     21066           coin_have_project_dir=yes
    2106621067         fi
    2106721068       done
    2106821069
    21069     if test $coin_pkg_is_here = yes; then
     21070    if test $coin_have_project_dir = yes; then
    2107021071      coin_has_blas=ThirdParty/Blas
    2107121072    fi
     
    2107821079echo "$as_me:$LINENO: checking whether project Blas need to be configured" >&5
    2107921080echo $ECHO_N "checking whether project Blas need to be configured... $ECHO_C" >&6
    21080 if test "$coin_has_blas" != skipping &&
    21081    test "$coin_has_blas" != notGiven &&
    21082    test "$coin_has_blas" != installed; then
     21081if test "$coin_have_project_dir" = yes ; then
    2108321082
    2108421083  if test -r $srcdir/ThirdParty/Blas/configure; then
     
    2110421103
    2110521104coin_has_lapack=notGiven
     21105coin_have_project_dir=no
    2110621106
    2110721107# check if user wants to skip project in any case
     
    2112121121  if test $PACKAGE_TARNAME = lapack; then
    2112221122    coin_has_lapack=.
     21123    coin_have_project_dir=yes
    2112321124  fi
    2112421125
     
    2115321154    # 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
    2115421155    if test -d "$prefix"; then
    21155       PKG_CONFIG_PATH="$prefix/lib/ThirdParty/pkgconfig:$PKG_CONFIG_PATH"
     21156      PKG_CONFIG_PATH="$prefix/lib/pkgconfig:$PKG_CONFIG_PATH"
    2115621157    fi
    2115721158
     
    2116521166   { (exit 1); exit 1; }; }
    2116621167       fi
    21167        PKG_CONFIG_PATH="$withval/lib/ThirdParty/pkgconfig:$PKG_CONFIG_PATH"
     21168       PKG_CONFIG_PATH="$withval/lib/pkgconfig:$PKG_CONFIG_PATH"
    2116821169
    2116921170fi;
     
    2117421175
    2117521176if test -n "$PKG_CONFIG" ; then
    21176   if $PKG_CONFIG --exists "lapack"; then
    21177     LAPACK_VERSION=`$PKG_CONFIG --modversion "lapack" 2>/dev/null`
    21178     coin_has_lapack="$LAPACK_VERSION"
     21177  if $PKG_CONFIG --exists "coinlapack"; then
     21178    COINLAPACK_VERSION=`$PKG_CONFIG --modversion "coinlapack" 2>/dev/null`
     21179    coin_has_lapack="$COINLAPACK_VERSION"
    2117921180  else
    21180     LAPACK_PKG_ERRORS=`$PKG_CONFIG $pkg_short_errors --errors-to-stdout --print-errors "lapack"`
    21181 
    21182   fi
    21183 else
    21184   { { echo "$as_me:$LINENO: error: \"Cannot check for existance of module Lapack without pkg-config\"" >&5
    21185 echo "$as_me: error: \"Cannot check for existance of module Lapack without pkg-config\"" >&2;}
     21181    COINLAPACK_PKG_ERRORS=`$PKG_CONFIG $pkg_short_errors --errors-to-stdout --print-errors "coinlapack"`
     21182
     21183  fi
     21184else
     21185  { { echo "$as_me:$LINENO: error: \"Cannot check for existance of module coinlapack without pkg-config\"" >&5
     21186echo "$as_me: error: \"Cannot check for existance of module coinlapack without pkg-config\"" >&2;}
    2118621187   { (exit 1); exit 1; }; }
    2118721188fi
     
    2119521196if test "$coin_has_lapack" = notGiven; then
    2119621197  if test -d $srcdir/ThirdParty/Lapack; then
    21197     coin_pkg_is_here=no
    2119821198    for i in $srcdir/ThirdParty/Lapack/LAPACK/SRC/dlarf.f; do
    2119921199         if test -r $i; then
    21200            coin_pkg_is_here=yes
     21200           coin_have_project_dir=yes
    2120121201         fi
    2120221202       done
    2120321203
    21204     if test $coin_pkg_is_here = yes; then
     21204    if test $coin_have_project_dir = yes; then
    2120521205      coin_has_lapack=ThirdParty/Lapack
    2120621206    fi
     
    2121321213echo "$as_me:$LINENO: checking whether project Lapack need to be configured" >&5
    2121421214echo $ECHO_N "checking whether project Lapack need to be configured... $ECHO_C" >&6
    21215 if test "$coin_has_lapack" != skipping &&
    21216    test "$coin_has_lapack" != notGiven &&
    21217    test "$coin_has_lapack" != installed; then
     21215if test "$coin_have_project_dir" = yes ; then
    2121821216
    2121921217  if test -r $srcdir/ThirdParty/Lapack/configure; then
     
    2123921237
    2124021238coin_has_sample=notGiven
     21239coin_have_project_dir=no
    2124121240
    2124221241# check if user wants to skip project in any case
     
    2125621255  if test $PACKAGE_TARNAME = sample; then
    2125721256    coin_has_sample=.
     21257    coin_have_project_dir=yes
    2125821258  fi
    2125921259
     
    2128821288    # 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
    2128921289    if test -d "$prefix"; then
    21290       PKG_CONFIG_PATH="$prefix/lib/Data/pkgconfig:$PKG_CONFIG_PATH"
     21290      PKG_CONFIG_PATH="$prefix/lib/pkgconfig:$PKG_CONFIG_PATH"
    2129121291    fi
    2129221292
     
    2130021300   { (exit 1); exit 1; }; }
    2130121301       fi
    21302        PKG_CONFIG_PATH="$withval/lib/Data/pkgconfig:$PKG_CONFIG_PATH"
     21302       PKG_CONFIG_PATH="$withval/lib/pkgconfig:$PKG_CONFIG_PATH"
    2130321303
    2130421304fi;
     
    2130921309
    2131021310if test -n "$PKG_CONFIG" ; then
    21311   if $PKG_CONFIG --exists "sample"; then
    21312     SAMPLE_VERSION=`$PKG_CONFIG --modversion "sample" 2>/dev/null`
    21313     coin_has_sample="$SAMPLE_VERSION"
     21311  if $PKG_CONFIG --exists "coindatasample"; then
     21312    COINDATASAMPLE_VERSION=`$PKG_CONFIG --modversion "coindatasample" 2>/dev/null`
     21313    coin_has_sample="$COINDATASAMPLE_VERSION"
    2131421314  else
    21315     SAMPLE_PKG_ERRORS=`$PKG_CONFIG $pkg_short_errors --errors-to-stdout --print-errors "sample"`
    21316 
    21317   fi
    21318 else
    21319   { { echo "$as_me:$LINENO: error: \"Cannot check for existance of module Sample without pkg-config\"" >&5
    21320 echo "$as_me: error: \"Cannot check for existance of module Sample without pkg-config\"" >&2;}
     21315    COINDATASAMPLE_PKG_ERRORS=`$PKG_CONFIG $pkg_short_errors --errors-to-stdout --print-errors "coindatasample"`
     21316
     21317  fi
     21318else
     21319  { { echo "$as_me:$LINENO: error: \"Cannot check for existance of module coindatasample without pkg-config\"" >&5
     21320echo "$as_me: error: \"Cannot check for existance of module coindatasample without pkg-config\"" >&2;}
    2132121321   { (exit 1); exit 1; }; }
    2132221322fi
     
    2133021330if test "$coin_has_sample" = notGiven; then
    2133121331  if test -d $srcdir/Data/Sample; then
    21332     coin_pkg_is_here=no
    21333      coin_pkg_is_here=yes
    21334 
    21335     if test $coin_pkg_is_here = yes; then
     21332     coin_have_project_dir=yes
     21333
     21334    if test $coin_have_project_dir = yes; then
    2133621335      coin_has_sample=Data/Sample
    2133721336    fi
     
    2134421343echo "$as_me:$LINENO: checking whether project Sample need to be configured" >&5
    2134521344echo $ECHO_N "checking whether project Sample need to be configured... $ECHO_C" >&6
    21346 if test "$coin_has_sample" != skipping &&
    21347    test "$coin_has_sample" != notGiven &&
    21348    test "$coin_has_sample" != installed; then
     21345if test "$coin_have_project_dir" = yes ; then
    2134921346
    2135021347  if test -r $srcdir/Data/Sample/configure; then
     
    2137021367
    2137121368coin_has_netlib=notGiven
     21369coin_have_project_dir=no
    2137221370
    2137321371# check if user wants to skip project in any case
     
    2138721385  if test $PACKAGE_TARNAME = netlib; then
    2138821386    coin_has_netlib=.
     21387    coin_have_project_dir=yes
    2138921388  fi
    2139021389
     
    2141921418    # 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
    2142021419    if test -d "$prefix"; then
    21421       PKG_CONFIG_PATH="$prefix/lib/Data/pkgconfig:$PKG_CONFIG_PATH"
     21420      PKG_CONFIG_PATH="$prefix/lib/pkgconfig:$PKG_CONFIG_PATH"
    2142221421    fi
    2142321422
     
    2143121430   { (exit 1); exit 1; }; }
    2143221431       fi
    21433        PKG_CONFIG_PATH="$withval/lib/Data/pkgconfig:$PKG_CONFIG_PATH"
     21432       PKG_CONFIG_PATH="$withval/lib/pkgconfig:$PKG_CONFIG_PATH"
    2143421433
    2143521434fi;
     
    2144021439
    2144121440if test -n "$PKG_CONFIG" ; then
    21442   if $PKG_CONFIG --exists "netlib"; then
    21443     NETLIB_VERSION=`$PKG_CONFIG --modversion "netlib" 2>/dev/null`
    21444     coin_has_netlib="$NETLIB_VERSION"
     21441  if $PKG_CONFIG --exists "coindatanetlib"; then
     21442    COINDATANETLIB_VERSION=`$PKG_CONFIG --modversion "coindatanetlib" 2>/dev/null`
     21443    coin_has_netlib="$COINDATANETLIB_VERSION"
    2144521444  else
    21446     NETLIB_PKG_ERRORS=`$PKG_CONFIG $pkg_short_errors --errors-to-stdout --print-errors "netlib"`
    21447 
    21448   fi
    21449 else
    21450   { { echo "$as_me:$LINENO: error: \"Cannot check for existance of module Netlib without pkg-config\"" >&5
    21451 echo "$as_me: error: \"Cannot check for existance of module Netlib without pkg-config\"" >&2;}
     21445    COINDATANETLIB_PKG_ERRORS=`$PKG_CONFIG $pkg_short_errors --errors-to-stdout --print-errors "coindatanetlib"`
     21446
     21447  fi
     21448else
     21449  { { echo "$as_me:$LINENO: error: \"Cannot check for existance of module coindatanetlib without pkg-config\"" >&5
     21450echo "$as_me: error: \"Cannot check for existance of module coindatanetlib without pkg-config\"" >&2;}
    2145221451   { (exit 1); exit 1; }; }
    2145321452fi
     
    2146121460if test "$coin_has_netlib" = notGiven; then
    2146221461  if test -d $srcdir/Data/Netlib; then
    21463     coin_pkg_is_here=no
    21464      coin_pkg_is_here=yes
    21465 
    21466     if test $coin_pkg_is_here = yes; then
     21462     coin_have_project_dir=yes
     21463
     21464    if test $coin_have_project_dir = yes; then
    2146721465      coin_has_netlib=Data/Netlib
    2146821466    fi
     
    2147521473echo "$as_me:$LINENO: checking whether project Netlib need to be configured" >&5
    2147621474echo $ECHO_N "checking whether project Netlib need to be configured... $ECHO_C" >&6
    21477 if test "$coin_has_netlib" != skipping &&
    21478    test "$coin_has_netlib" != notGiven &&
    21479    test "$coin_has_netlib" != installed; then
     21475if test "$coin_have_project_dir" = yes ; then
    2148021476
    2148121477  if test -r $srcdir/Data/Netlib/configure; then
     
    2150121497
    2150221498coin_has_coinutils=notGiven
     21499coin_have_project_dir=no
    2150321500
    2150421501# check if user wants to skip project in any case
     
    2151821515  if test $PACKAGE_TARNAME = coinutils; then
    2151921516    coin_has_coinutils=.
     21517    coin_have_project_dir=yes
    2152021518  fi
    2152121519
     
    2155021548    # 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
    2155121549    if test -d "$prefix"; then
    21552       PKG_CONFIG_PATH="$prefix/lib//pkgconfig:$PKG_CONFIG_PATH"
     21550      PKG_CONFIG_PATH="$prefix/lib/pkgconfig:$PKG_CONFIG_PATH"
    2155321551    fi
    2155421552
     
    2156221560   { (exit 1); exit 1; }; }
    2156321561       fi
    21564        PKG_CONFIG_PATH="$withval/lib//pkgconfig:$PKG_CONFIG_PATH"
     21562       PKG_CONFIG_PATH="$withval/lib/pkgconfig:$PKG_CONFIG_PATH"
    2156521563
    2156621564fi;
     
    2159221590if test "$coin_has_coinutils" = notGiven; then
    2159321591  if test -d $srcdir//CoinUtils; then
    21594     coin_pkg_is_here=no
    21595      coin_pkg_is_here=yes
    21596 
    21597     if test $coin_pkg_is_here = yes; then
     21592     coin_have_project_dir=yes
     21593
     21594    if test $coin_have_project_dir = yes; then
    2159821595      coin_has_coinutils=/CoinUtils
    2159921596    fi
     
    2160621603echo "$as_me:$LINENO: checking whether project CoinUtils need to be configured" >&5
    2160721604echo $ECHO_N "checking whether project CoinUtils need to be configured... $ECHO_C" >&6
    21608 if test "$coin_has_coinutils" != skipping &&
    21609    test "$coin_has_coinutils" != notGiven &&
    21610    test "$coin_has_coinutils" != installed; then
     21605if test "$coin_have_project_dir" = yes ; then
    2161121606
    2161221607  if test -r $srcdir//CoinUtils/configure; then
     
    2163221627
    2163321628coin_has_clp=notGiven
     21629coin_have_project_dir=no
    2163421630
    2163521631# check if user wants to skip project in any case
     
    2164921645  if test $PACKAGE_TARNAME = clp; then
    2165021646    coin_has_clp=.
     21647    coin_have_project_dir=yes
    2165121648  fi
    2165221649
     
    2168121678    # 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
    2168221679    if test -d "$prefix"; then
    21683       PKG_CONFIG_PATH="$prefix/lib//pkgconfig:$PKG_CONFIG_PATH"
     21680      PKG_CONFIG_PATH="$prefix/lib/pkgconfig:$PKG_CONFIG_PATH"
    2168421681    fi
    2168521682
     
    2169321690   { (exit 1); exit 1; }; }
    2169421691       fi
    21695        PKG_CONFIG_PATH="$withval/lib//pkgconfig:$PKG_CONFIG_PATH"
     21692       PKG_CONFIG_PATH="$withval/lib/pkgconfig:$PKG_CONFIG_PATH"
    2169621693
    2169721694fi;
     
    2172321720if test "$coin_has_clp" = notGiven; then
    2172421721  if test -d $srcdir//Clp; then
    21725     coin_pkg_is_here=no
    21726      coin_pkg_is_here=yes
    21727 
    21728     if test $coin_pkg_is_here = yes; then
     21722     coin_have_project_dir=yes
     21723
     21724    if test $coin_have_project_dir = yes; then
    2172921725      coin_has_clp=/Clp
    2173021726    fi
     
    2173721733echo "$as_me:$LINENO: checking whether project Clp need to be configured" >&5
    2173821734echo $ECHO_N "checking whether project Clp need to be configured... $ECHO_C" >&6
    21739 if test "$coin_has_clp" != skipping &&
    21740    test "$coin_has_clp" != notGiven &&
    21741    test "$coin_has_clp" != installed; then
     21735if test "$coin_have_project_dir" = yes ; then
    2174221736
    2174321737  if test -r $srcdir//Clp/configure; then
  • stable/BSPsplit/configure.ac

    r1465 r1510  
    4343#############################################################################
    4444
    45 AC_COIN_MAIN_PACKAGEDIR(Blas,ThirdParty,daxpy.f)
    46 AC_COIN_MAIN_PACKAGEDIR(Lapack,ThirdParty,[LAPACK/SRC/dlarf.f])
    47 AC_COIN_MAIN_PACKAGEDIR(Sample,Data)
    48 AC_COIN_MAIN_PACKAGEDIR(Netlib,Data)
     45AC_COIN_MAIN_PACKAGEDIR(Blas,ThirdParty,daxpy.f,coinblas)
     46AC_COIN_MAIN_PACKAGEDIR(Lapack,ThirdParty,[LAPACK/SRC/dlarf.f],coinlapack)
     47AC_COIN_MAIN_PACKAGEDIR(Sample,Data,,coindatasample)
     48AC_COIN_MAIN_PACKAGEDIR(Netlib,Data,,coindatanetlib)
    4949AC_COIN_MAIN_PACKAGEDIR(CoinUtils)
    5050AC_COIN_MAIN_PACKAGEDIR(Clp)
Note: See TracChangeset for help on using the changeset viewer.