Changeset 2334


Ignore:
Timestamp:
Oct 10, 2018 2:23:54 PM (7 months ago)
Author:
lou
Message:

Install .pc files. Fix collateral damage from BuildTools? r3848.

Location:
branches/autotools-update/Clp
Files:
12 edited

Legend:

Unmodified
Added
Removed
  • branches/autotools-update/Clp/Makefile.am

    r2310 r2334  
    1212
    1313########################################################################
    14 #                          Subdirectories                              #
     14#            Subdirectories and installation of .pc files              #
    1515########################################################################
    1616
    1717SUBDIRS = src
     18
     19pkgconfiglibdir = $(libdir)/pkgconfig
     20pkgconfiglib_DATA = clp.pc
    1821
    1922# Build OsiClp only if Osi is available.
     
    2124if COIN_HAS_OSI
    2225  SUBDIRS += src/OsiClp
     26  pkgconfiglib_DATA += osi-clp.pc
    2327endif
    2428
    25 # We don't want to compile the test subdirectory unless the test target is
    26 # specified.  But we need to list it as subdirectory to make sure that it is
    27 # included in the tarball.
     29# We don't want to compile the test subdirectory unless the test target
     30# is specified.  But we need to list it as subdirectory to make sure that
     31# it's included in the tarball.
    2832
    2933if ALWAYS_FALSE
  • branches/autotools-update/Clp/Makefile.in

    r2316 r2334  
    3535# developers, autoconf leaves datadir = $(datarootdir) but forces docdir
    3636# to $(datarootdir)/doc/$(PACKAGE_TARNAME).
     37
    3738VPATH = @srcdir@
    3839am__is_gnu_make = { \
     
    110111# Build OsiClp only if Osi is available.
    111112@COIN_HAS_OSI_TRUE@am__append_1 = src/OsiClp
    112 
    113 # We don't want to compile the test subdirectory unless the test target is
    114 # specified.  But we need to list it as subdirectory to make sure that it is
    115 # included in the tarball.
    116 @ALWAYS_FALSE@am__append_2 = test
     113@COIN_HAS_OSI_TRUE@am__append_2 = osi-clp.pc
     114
     115# We don't want to compile the test subdirectory unless the test target
     116# is specified.  But we need to list it as subdirectory to make sure that
     117# it's included in the tarball.
     118@ALWAYS_FALSE@am__append_3 = test
    117119subdir = .
    118120ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
     
    157159    *) (install-info --version) >/dev/null 2>&1;; \
    158160  esac
     161am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
     162am__vpath_adj = case $$p in \
     163    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
     164    *) f=$$p;; \
     165  esac;
     166am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
     167am__install_max = 40
     168am__nobase_strip_setup = \
     169  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
     170am__nobase_strip = \
     171  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
     172am__nobase_list = $(am__nobase_strip_setup); \
     173  for p in $$list; do echo "$$p $$p"; done | \
     174  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
     175  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
     176    if (++n[$$2] == $(am__install_max)) \
     177      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
     178    END { for (dir in files) print dir, files[dir] }'
     179am__base_list = \
     180  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
     181  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
     182am__uninstall_files_from_dir = { \
     183  test -z "$$files" \
     184    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
     185    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
     186         $(am__cd) "$$dir" && rm -f $$files; }; \
     187  }
     188am__installdirs = "$(DESTDIR)$(pkgconfiglibdir)"
     189DATA = $(pkgconfiglib_DATA)
    159190RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
    160191  distclean-recursive maintainer-clean-recursive
     
    200231CFLAGS = @CFLAGS@
    201232CLPLIB_CFLAGS = @CLPLIB_CFLAGS@
    202 CLPLIB_CFLAGS_PUB = @CLPLIB_CFLAGS_PUB@
    203 CLPLIB_LIBS = @CLPLIB_LIBS@
    204 CLPLIB_LIBS_PUB = @CLPLIB_LIBS_PUB@
     233CLPLIB_CFLAGS_NOPC = @CLPLIB_CFLAGS_NOPC@
     234CLPLIB_LFLAGS = @CLPLIB_LFLAGS@
     235CLPLIB_LFLAGS_NOPC = @CLPLIB_LFLAGS_NOPC@
    205236CLPLIB_PCFILES = @CLPLIB_PCFILES@
    206 CLPLIB_PCFILES_PUB = @CLPLIB_PCFILES_PUB@
    207237CLP_SVN_REV = @CLP_SVN_REV@
    208238COIN_PKG_CONFIG_PATH = @COIN_PKG_CONFIG_PATH@
     
    257287OBJEXT = @OBJEXT@
    258288OSICLPLIB_CFLAGS = @OSICLPLIB_CFLAGS@
    259 OSICLPLIB_CFLAGS_PUB = @OSICLPLIB_CFLAGS_PUB@
    260 OSICLPLIB_LIBS = @OSICLPLIB_LIBS@
    261 OSICLPLIB_LIBS_PUB = @OSICLPLIB_LIBS_PUB@
     289OSICLPLIB_CFLAGS_NOPC = @OSICLPLIB_CFLAGS_NOPC@
     290OSICLPLIB_LFLAGS = @OSICLPLIB_LFLAGS@
     291OSICLPLIB_LFLAGS_NOPC = @OSICLPLIB_LFLAGS_NOPC@
    262292OSICLPLIB_PCFILES = @OSICLPLIB_PCFILES@
    263 OSICLPLIB_PCFILES_PUB = @OSICLPLIB_PCFILES_PUB@
    264293OSICLPUNITTEST_CFLAGS = @OSICLPUNITTEST_CFLAGS@
    265 OSICLPUNITTEST_CFLAGS_PUB = @OSICLPUNITTEST_CFLAGS_PUB@
    266 OSICLPUNITTEST_LIBS = @OSICLPUNITTEST_LIBS@
    267 OSICLPUNITTEST_LIBS_PUB = @OSICLPUNITTEST_LIBS_PUB@
     294OSICLPUNITTEST_CFLAGS_NOPC = @OSICLPUNITTEST_CFLAGS_NOPC@
     295OSICLPUNITTEST_LFLAGS = @OSICLPUNITTEST_LFLAGS@
     296OSICLPUNITTEST_LFLAGS_NOPC = @OSICLPUNITTEST_LFLAGS_NOPC@
    268297OSICLPUNITTEST_PCFILES = @OSICLPUNITTEST_PCFILES@
    269 OSICLPUNITTEST_PCFILES_PUB = @OSICLPUNITTEST_PCFILES_PUB@
    270298OTOOL = @OTOOL@
    271299OTOOL64 = @OTOOL64@
     
    370398
    371399########################################################################
    372 #                          Subdirectories                              #
    373 ########################################################################
    374 SUBDIRS = src $(am__append_1) $(am__append_2)
     400#            Subdirectories and installation of .pc files              #
     401########################################################################
     402SUBDIRS = src $(am__append_1) $(am__append_3)
     403pkgconfiglibdir = $(libdir)/pkgconfig
     404pkgconfiglib_DATA = clp.pc $(am__append_2)
    375405
    376406########################################################################
     
    486516distclean-libtool:
    487517        -rm -f libtool config.lt
     518install-pkgconfiglibDATA: $(pkgconfiglib_DATA)
     519        @$(NORMAL_INSTALL)
     520        @list='$(pkgconfiglib_DATA)'; test -n "$(pkgconfiglibdir)" || list=; \
     521        if test -n "$$list"; then \
     522          echo " $(MKDIR_P) '$(DESTDIR)$(pkgconfiglibdir)'"; \
     523          $(MKDIR_P) "$(DESTDIR)$(pkgconfiglibdir)" || exit 1; \
     524        fi; \
     525        for p in $$list; do \
     526          if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
     527          echo "$$d$$p"; \
     528        done | $(am__base_list) | \
     529        while read files; do \
     530          echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgconfiglibdir)'"; \
     531          $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgconfiglibdir)" || exit $$?; \
     532        done
     533
     534uninstall-pkgconfiglibDATA:
     535        @$(NORMAL_UNINSTALL)
     536        @list='$(pkgconfiglib_DATA)'; test -n "$(pkgconfiglibdir)" || list=; \
     537        files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
     538        dir='$(DESTDIR)$(pkgconfiglibdir)'; $(am__uninstall_files_from_dir)
    488539
    489540# This directory's subdirectories are mostly independent; you can cd
     
    594645check-am: all-am
    595646check: check-recursive
    596 all-am: Makefile
     647all-am: Makefile $(DATA)
    597648installdirs: installdirs-recursive
    598649installdirs-am:
     650        for dir in "$(DESTDIR)$(pkgconfiglibdir)"; do \
     651          test -z "$$dir" || $(MKDIR_P) "$$dir"; \
     652        done
    599653install: install-recursive
    600654install-exec: install-exec-recursive
     
    651705info-am:
    652706
    653 install-data-am:
     707install-data-am: install-pkgconfiglibDATA
    654708
    655709install-dvi: install-dvi-recursive
     
    697751ps-am:
    698752
    699 uninstall-am: uninstall-local
     753uninstall-am: uninstall-local uninstall-pkgconfiglibDATA
    700754
    701755.MAKE: $(am__recursive_targets) install-am install-strip
     
    709763        install-dvi-am install-exec install-exec-am install-exec-local \
    710764        install-html install-html-am install-info install-info-am \
    711         install-man install-pdf install-pdf-am install-ps \
    712         install-ps-am install-strip installcheck installcheck-am \
    713         installdirs installdirs-am maintainer-clean \
    714         maintainer-clean-generic mostlyclean mostlyclean-generic \
    715         mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
    716         uninstall-am uninstall-local
     765        install-man install-pdf install-pdf-am \
     766        install-pkgconfiglibDATA install-ps install-ps-am \
     767        install-strip installcheck installcheck-am installdirs \
     768        installdirs-am maintainer-clean maintainer-clean-generic \
     769        mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
     770        ps ps-am tags tags-am uninstall uninstall-am uninstall-local \
     771        uninstall-pkgconfiglibDATA
    717772
    718773.PRECIOUS: Makefile
  • branches/autotools-update/Clp/clp.pc.in

    r2314 r2334  
    88URL: https://projects.coin-or.org/Clp
    99Version: @PACKAGE_VERSION@
    10 Libs: -L${libdir} -lClpSolver -lClp @CLPLIB_PCLIBS@
    11 Cflags: -I${includedir}
    12 Requires: @CLPLIB_PCFILES@
     10Libs: -L${libdir} -lClpSolver -lClp
     11Libs.private: @CLPLIB_LFLAGS_NOPC@
     12Cflags: -I${includedir} @CLPLIB_CFLAGS_NOPC@
     13Requires:
     14Requires.private: @CLPLIB_PCFILES@
  • branches/autotools-update/Clp/configure

    r2316 r2334  
    644644LTLIBOBJS
    645645LIBOBJS
     646OSICLPUNITTEST_CFLAGS_NOPC
     647OSICLPUNITTEST_LFLAGS_NOPC
     648OSICLPLIB_CFLAGS_NOPC
     649OSICLPLIB_LFLAGS_NOPC
     650CLPLIB_CFLAGS_NOPC
     651CLPLIB_LFLAGS_NOPC
    646652COIN_CXX_IS_CL_FALSE
    647653COIN_CXX_IS_CL_TRUE
    648 DEPENDENCY_LINKING_FALSE
    649 DEPENDENCY_LINKING_TRUE
    650654coin_doxy_tagfiles
    651655COIN_HAS_LATEX_FALSE
     
    687691COIN_HAS_OSITESTS_FALSE
    688692COIN_HAS_OSITESTS_TRUE
    689 OSICLPUNITTEST_PCFILES_PUB
    690 OSICLPUNITTEST_CFLAGS_PUB
    691 OSICLPUNITTEST_LIBS_PUB
    692693OSICLPUNITTEST_PCFILES
    693694OSICLPUNITTEST_CFLAGS
    694 OSICLPUNITTEST_LIBS
     695OSICLPUNITTEST_LFLAGS
    695696COIN_HAS_OSI_FALSE
    696697COIN_HAS_OSI_TRUE
    697 OSICLPLIB_PCFILES_PUB
    698 OSICLPLIB_CFLAGS_PUB
    699 OSICLPLIB_LIBS_PUB
    700698OSICLPLIB_PCFILES
    701699OSICLPLIB_CFLAGS
    702 OSICLPLIB_LIBS
     700OSICLPLIB_LFLAGS
    703701COIN_HAS_COINUTILS_FALSE
    704702COIN_HAS_COINUTILS_TRUE
    705 CLPLIB_PCFILES_PUB
    706 CLPLIB_CFLAGS_PUB
    707 CLPLIB_LIBS_PUB
    708703CLPLIB_PCFILES
    709704CLPLIB_CFLAGS
    710 CLPLIB_LIBS
     705CLPLIB_LFLAGS
    711706COIN_PKG_CONFIG_PATH
    712707COIN_HAS_PKGCONFIG_FALSE
     
    714709ac_ct_PKG_CONFIG
    715710PKG_CONFIG
     711DEPENDENCY_LINKING_FALSE
     712DEPENDENCY_LINKING_TRUE
    716713LT_LDFLAGS
    717714CXXCPP
     
    861858with_sysroot
    862859enable_libtool_lock
     860enable_dependency_linking
    863861with_coinutils
    864 with_coinutils_libs
     862with_coinutils_lflags
    865863with_coinutils_cflags
    866864with_osi
    867 with_osi_libs
     865with_osi_lflags
    868866with_osi_cflags
    869867with_ositests
    870 with_ositests_libs
     868with_ositests_lflags
    871869with_ositests_cflags
    872870with_sample
     
    876874enable_aboca
    877875with_amd
    878 with_amd_libs
     876with_amd_lflags
    879877with_amd_cflags
    880878with_cholmod
    881 with_cholmod_libs
     879with_cholmod_lflags
    882880with_cholmod_cflags
    883881with_glpk
    884 with_glpk_libs
     882with_glpk_lflags
    885883with_glpk_cflags
    886884with_mumps
    887 with_mumps_libs
     885with_mumps_lflags
    888886with_mumps_cflags
    889887with_wsmp
    890 with_wsmp_libs
     888with_wsmp_lflags
    891889with_wsmp_cflags
    892890with_asl
    893 with_asl_libs
     891with_asl_lflags
    894892with_asl_cflags
    895893enable_readline
     
    15421540  --disable-dependency-tracking
    15431541                          speeds up one-time build
    1544   --enable-shared[=PKGS]  build shared libraries [default=no]
    1545   --enable-static[=PKGS]  build static libraries [default=no]
     1542  --enable-shared[=PKGS]  build shared libraries [default=yes]
     1543  --enable-static[=PKGS]  build static libraries [default=yes]
    15461544  --enable-fast-install[=PKGS]
    15471545                          optimize for fast installation [default=yes]
    15481546  --disable-libtool-lock  avoid locking (might break parallel builds)
     1547  --enable-dependency-linking
     1548                          Link all library dependencies into shared libraries
     1549                          at creation (default=yes)
    15491550  --enable-aboca          Enables build of the Aboca solver; 1 - build Abc
    15501551                          serial but no inherit code (default when built); 2 -
     
    15681569                          equivalent to --with-coinutils, 'no' is
    15691570                          equivalent to --without-coinutils. Any other
    1570                           argument is applied as for --with-coinutils-libs
    1571   --with-coinutils-libs  Linker flags for CoinUtils appropriate for your
     1571                          argument is applied as for --with-coinutils-lflags
     1572  --with-coinutils-lflags Linker flags for CoinUtils appropriate for your
    15721573                          environment. (Most often, -l specs for libraries.)
    15731574  --with-coinutils-cflags Compiler flags for CoinUtils appropriate for your
     
    15771578                          equivalent to --with-osi, 'no' is
    15781579                          equivalent to --without-osi. Any other argument is
    1579                           applied as for --with-osi-libs
    1580   --with-osi-libs         Linker flags for Osi appropriate for your
     1580                          applied as for --with-osi-lflags
     1581  --with-osi-lflags       Linker flags for Osi appropriate for your
    15811582                          environment. (Most often, -l specs for libraries.)
    15821583  --with-osi-cflags       Compiler flags for Osi appropriate for your
     
    15861587                          equivalent to --with-ositests, 'no' is
    15871588                          equivalent to --without-ositests. Any other argument
    1588                           is applied as for --with-ositests-libs
    1589   --with-ositests-libs    Linker flags for OsiTests appropriate for your
     1589                          is applied as for --with-ositests-lflags
     1590  --with-ositests-lflags  Linker flags for OsiTests appropriate for your
    15901591                          environment. (Most often, -l specs for libraries.)
    15911592  --with-ositests-cflags  Compiler flags for OsiTests appropriate for your
     
    16071608                          equivalent to --with-amd, 'no' is
    16081609                          equivalent to --without-amd. Any other argument is
    1609                           applied as for --with-amd-libs
    1610   --with-amd-libs         Linker flags for AMD appropriate for your
     1610                          applied as for --with-amd-lflags
     1611  --with-amd-lflags       Linker flags for AMD appropriate for your
    16111612                          environment. (Most often, -l specs for libraries.)
    16121613  --with-amd-cflags       Compiler flags for AMD appropriate for your
     
    16161617                          equivalent to --with-cholmod, 'no' is
    16171618                          equivalent to --without-cholmod. Any other argument
    1618                           is applied as for --with-cholmod-libs
    1619   --with-cholmod-libs     Linker flags for CHOLMOD appropriate for your
     1619                          is applied as for --with-cholmod-lflags
     1620  --with-cholmod-lflags   Linker flags for CHOLMOD appropriate for your
    16201621                          environment. (Most often, -l specs for libraries.)
    16211622  --with-cholmod-cflags   Compiler flags for CHOLMOD appropriate for your
     
    16251626                          equivalent to --with-glpk, 'no' is
    16261627                          equivalent to --without-glpk. Any other argument is
    1627                           applied as for --with-glpk-libs
    1628   --with-glpk-libs        Linker flags for Glpk appropriate for your
     1628                          applied as for --with-glpk-lflags
     1629  --with-glpk-lflags      Linker flags for Glpk appropriate for your
    16291630                          environment. (Most often, -l specs for libraries.)
    16301631  --with-glpk-cflags      Compiler flags for Glpk appropriate for your
     
    16341635                          equivalent to --with-mumps, 'no' is
    16351636                          equivalent to --without-mumps. Any other argument is
    1636                           applied as for --with-mumps-libs
    1637   --with-mumps-libs       Linker flags for Mumps appropriate for your
     1637                          applied as for --with-mumps-lflags
     1638  --with-mumps-lflags     Linker flags for Mumps appropriate for your
    16381639                          environment. (Most often, -l specs for libraries.)
    16391640  --with-mumps-cflags     Compiler flags for Mumps appropriate for your
     
    16431644                          equivalent to --with-wsmp, 'no' is
    16441645                          equivalent to --without-wsmp. Any other argument is
    1645                           applied as for --with-wsmp-libs
    1646   --with-wsmp-libs        Linker flags for WSMP appropriate for your
     1646                          applied as for --with-wsmp-lflags
     1647  --with-wsmp-lflags      Linker flags for WSMP appropriate for your
    16471648                          environment. (Most often, -l specs for libraries.)
    16481649  --with-wsmp-cflags      Compiler flags for WSMP appropriate for your
     
    16521653                          equivalent to --with-asl, 'no' is
    16531654                          equivalent to --without-asl. Any other argument is
    1654                           applied as for --with-asl-libs
    1655   --with-asl-libs         Linker flags for ASL appropriate for your
     1655                          applied as for --with-asl-lflags
     1656  --with-asl-lflags       Linker flags for ASL appropriate for your
    16561657                          environment. (Most often, -l specs for libraries.)
    16571658  --with-asl-cflags       Compiler flags for ASL appropriate for your
     
    36863687# Setting up libtool with LT_INIT will AC_REQUIRE AC_PROG_CC, but we want
    36873688# to invoke it from this macro first so that we can supply a parameter.
    3688 
    36893689
    36903690
     
    98519851# On Windows, shared C++ libraries do not work with the current libtool (it
    98529852# handles only exports for C functions, not C++). On all other systems, build
    9853 # shared libraries.
    9854 
    9855   case $host_os in
    9856     cygwin* | mingw* | msys* )
    9857       # Check whether --enable-shared was given.
     9853# only shared libraries.
     9854
     9855# (lh, 180302) Sadly, we can't use the obvious libtool macros
     9856# (AC_{ENABLE,DISABLE}_{SHARED,STATIC}, nor parameters to LT_INIT,
     9857# precisely because these macros record the default behaviour by defining
     9858# a macro, _LT_ENABLE_{SHARED,STATIC}_DEFAULT. No shell code involved, hence
     9859# any shell conditional has no effect. Either we trust libtool or we need
     9860# something more inventive. The relevant libtool macros are in ltoptions.m4,
     9861# _LT_ENABLE_SHARED and _LT_ENABLE_STATIC.
     9862
     9863# case $host_os in
     9864#   cygwin* | mingw* | msys* )
     9865#     AC_DISABLE_SHARED
     9866#     ;;
     9867#   *)
     9868#     AC_DISABLE_STATIC
     9869#     ;;
     9870# esac
     9871
     9872# Create libtool.
     9873
     9874
     9875
     9876
     9877
     9878# Set options
     9879
     9880
     9881
     9882        enable_dlopen=no
     9883
     9884
     9885  enable_win32_dll=no
     9886
     9887
     9888            # Check whether --enable-shared was given.
    98589889if test "${enable_shared+set}" = set; then :
    98599890  enableval=$enable_shared; p=${PACKAGE-default}
     
    98759906    esac
    98769907else
    9877   enable_shared=no
    9878 fi
    9879 
    9880 
    9881 
    9882 
    9883 
    9884 
    9885 
    9886 
    9887 
    9888       ;;
    9889     *)
    9890       # Check whether --enable-static was given.
     9908  enable_shared=yes
     9909fi
     9910
     9911
     9912
     9913
     9914
     9915
     9916
     9917
     9918
     9919  # Check whether --enable-static was given.
    98919920if test "${enable_static+set}" = set; then :
    98929921  enableval=$enable_static; p=${PACKAGE-default}
     
    99089937    esac
    99099938else
    9910   enable_static=no
    9911 fi
    9912 
    9913 
    9914 
    9915 
    9916 
    9917 
    9918 
    9919 
    9920 
    9921       ;;
    9922   esac
    9923 
    9924 # Create libtool
    9925 
    9926 
    9927 
    9928 
    9929 
    9930 # Set options
    9931 
    9932 
    9933 
    9934         enable_dlopen=no
    9935 
    9936 
    9937   enable_win32_dll=no
     9939  enable_static=yes
     9940fi
     9941
     9942
     9943
     9944
     9945
    99389946
    99399947
     
    2051420522  esac
    2051520523
    20516 # -no-undefined is required for DLLs on Windows
    20517 
    20518   LT_LDFLAGS="-no-undefined"
     20524# Set up LT_LDFLAGS. Add the library version string to LT_LDFLAGS, if one
     20525# is supplied.
     20526
     20527
     20528  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the library version is set" >&5
     20529$as_echo_n "checking if the library version is set... " >&6; }
     20530  if test x"$coin_libversion" != x ; then
     20531    LT_LDFLAGS="$LT_LDFLAGS -version-info $coin_libversion"
     20532    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $coin_libversion" >&5
     20533$as_echo "$coin_libversion" >&6; }
     20534  else
     20535    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
     20536$as_echo "no" >&6; }
     20537  fi
     20538
     20539# Check if dependency linking is enabled or disabled.
     20540
     20541
     20542  # Check whether --enable-dependency-linking was given.
     20543if test "${enable_dependency_linking+set}" = set; then :
     20544  enableval=$enable_dependency_linking; dependency_linking="$enableval"
     20545else
     20546  dependency_linking=yes
     20547fi
     20548
     20549
     20550# AC_SUBST([LT_LDFLAGS])
     20551# if test "$dependency_linking" = yes ; then
     20552#   LT_LDFLAGS="$LT_LDFLAGS -no-undefined"
     20553# fi
     20554
     20555   if test "$dependency_linking" = yes; then
     20556  DEPENDENCY_LINKING_TRUE=
     20557  DEPENDENCY_LINKING_FALSE='#'
     20558else
     20559  DEPENDENCY_LINKING_TRUE='#'
     20560  DEPENDENCY_LINKING_FALSE=
     20561fi
     20562
     20563
    2051920564
    2052020565
     
    2068620731$as_echo_n "checking $PKG_CONFIG is at least version $pkg_min_version... " >&6; }
    2068720732    if $PKG_CONFIG --atleast-pkgconfig-version $pkg_min_version ; then
    20688       { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes: \`$PKG_CONFIG --version\`" >&5
    20689 $as_echo "yes: \`$PKG_CONFIG --version\`" >&6; }
     20733      pkg_version=`$PKG_CONFIG --version`
     20734      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes: $pkg_version" >&5
     20735$as_echo "yes: $pkg_version" >&6; }
    2069020736    else
    2069120737     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
     
    2072120767# ${libdir}/pkgconfig. But autoconf sets $libdir to '${exec_prefix}/lib', and
    2072220768# $exec_prefix to '${prefix}'.  COIN_INITIALIZE will set ac_default_prefix
    20723 # correctly. Unless the user specifies --prefix, it is set to NONE
    20724 # until the end of configuration, at which point it will be set to
    20725 # $ac_default_prefix. Unless the user specifies --exec-prefix, it is
    20726 # set to NONE until the end of configuration, at which point it's set to
     20769# correctly. Unless the user specifies --prefix, prefix is set to
     20770# NONE until the end of configuration, at which point it will be set to
     20771# $ac_default_prefix. Unless the user specifies --exec-prefix, exec-prefix
     20772# is set to NONE until the end of configuration, at which point it's set to
    2072720773# '${prefix}'. Sheesh.  So do the expansion, then back it out. Of course,
    2072820774# this whole house of cards balances on the shaky assumption that the user is
     
    2075920805$as_echo_n "checking for package CoinUtils... " >&6; }
    2076020806
    20761   pubpriv=private
    20762 
    2076320807# Make sure the necessary variables exist for each client package.
    2076420808
     
    2076720811
    2076820812
    20769 
    20770 
    20771 
    20772 # Check to see if the user has overridden configure parameters from the
    20773 # environment.
     20813# Check to see if the user has set an override to skip this primary.
    2077420814
    2077520815  coin_has_coinutils=noInfo
     
    2078220822  fi
    2078320823
    20784 # If we're not skipping this project, define and process the command line
     20824# If we're not skipping this primary, define and process the command line
    2078520825# options according to the cmdopts parameter. Then invoke FIND_PRIM_PKG to do
    2078620826# the heavy lifting.
     
    2079820838
    2079920839
    20800 # Check whether --with-coinutils-libs was given.
    20801 if test "${with_coinutils_libs+set}" = set; then :
    20802   withval=$with_coinutils_libs;
     20840# Check whether --with-coinutils-lflags was given.
     20841if test "${with_coinutils_lflags+set}" = set; then :
     20842  withval=$with_coinutils_lflags;
    2080320843fi
    2080420844
     
    2082120861
    2082220862  coin_has_coinutils=noInfo
    20823   coinutils_libs=
     20863  coinutils_lflags=
    2082420864  coinutils_cflags=
    2082520865  coinutils_data=
     
    2084320883      * )
    2084420884        coin_has_coinutils=yes
    20845         coinutils_libs=$withval
     20885        coinutils_lflags=$withval
    2084620886        ;;
    2084720887    esac
     
    2085320893
    2085420894  if test "$coin_has_coinutils" != skipping ; then
    20855        withval=$with_coinutils_lib
     20895       withval=$with_coinutils_lflags
    2085620896       if test -n "$withval" ; then
    2085720897         case "$withval" in
     
    2086120901           * )
    2086220902             coin_has_coinutils=yes
    20863              coinutils_libs=$withval
     20903             coinutils_lflags=$withval
    2086420904             ;;
    2086520905         esac
     
    2096421004      { $as_echo "$as_me:${as_lineno-$LINENO}: Collected values for package 'coinutils'" >&5
    2096521005$as_echo "$as_me: Collected values for package 'coinutils'" >&6;}
    20966       { $as_echo "$as_me:${as_lineno-$LINENO}: coinutils_libs is \"$coinutils_libs\"" >&5
    20967 $as_echo "$as_me: coinutils_libs is \"$coinutils_libs\"" >&6;}
     21006      { $as_echo "$as_me:${as_lineno-$LINENO}: coinutils_lflags is \"$coinutils_lflags\"" >&5
     21007$as_echo "$as_me: coinutils_lflags is \"$coinutils_lflags\"" >&6;}
    2096821008      { $as_echo "$as_me:${as_lineno-$LINENO}: coinutils_cflags is \"$coinutils_cflags\"" >&5
    2096921009$as_echo "$as_me: coinutils_cflags is \"$coinutils_cflags\"" >&6;}
     
    2100021040
    2100121041# If we've located the package, define preprocessor symbol COIN_HAS_PRIM and
    21002 # augment the necessary variables for the client packages. We need the final
    21003 # ':' (noop) below because it's possible that the list of client packages
    21004 # is empty.
     21042# augment the necessary variables for the client packages.
    2100521043
    2100621044  if test $coin_has_coinutils = yes ; then
     
    2100821046$as_echo "#define COIN_HAS_COINUTILS 1" >>confdefs.h
    2100921047
    21010     if test $pubpriv = private ; then
    21011       CLPLIB_PCFILES="$coinutils_pcfiles $CLPLIB_PCFILES"
    21012          CLPLIB_LIBS="$coinutils_libs $CLPLIB_LIBS"
    21013          CLPLIB_CFLAGS="$coinutils_cflags $CLPLIB_CFLAGS"
    21014       :
    21015     else
    21016       CLPLIB_PCFILES_PUB="$coinutils_pcfiles $CLPLIB_PCFILES"_PUB
    21017          CLPLIB_LIBS_PUB="$coinutils_libs $CLPLIB_LIBS_PUB"
    21018          CLPLIB_CFLAGS_PUB="$coinutils_cflags $CLPLIB_CFLAGS_PUB"
    21019       :
    21020     fi
     21048    CLPLIB_PCFILES="$coinutils_pcfiles $CLPLIB_PCFILES"
     21049       CLPLIB_LFLAGS="$coinutils_lflags $CLPLIB_LFLAGS"
     21050       CLPLIB_CFLAGS="$coinutils_cflags $CLPLIB_CFLAGS"
    2102121051
    2102221052# Finally, set up PRIM_DATA, unless the user specified nodata.
     
    2103421064$as_echo_n "checking for package Osi... " >&6; }
    2103521065
    21036   pubpriv=private
    21037 
    2103821066# Make sure the necessary variables exist for each client package.
    2103921067
     
    2104221070
    2104321071
    21044 
    21045 
    21046 
    21047 # Check to see if the user has overridden configure parameters from the
    21048 # environment.
     21072# Check to see if the user has set an override to skip this primary.
    2104921073
    2105021074  coin_has_osi=noInfo
     
    2105721081  fi
    2105821082
    21059 # If we're not skipping this project, define and process the command line
     21083# If we're not skipping this primary, define and process the command line
    2106021084# options according to the cmdopts parameter. Then invoke FIND_PRIM_PKG to do
    2106121085# the heavy lifting.
     
    2107321097
    2107421098
    21075 # Check whether --with-osi-libs was given.
    21076 if test "${with_osi_libs+set}" = set; then :
    21077   withval=$with_osi_libs;
     21099# Check whether --with-osi-lflags was given.
     21100if test "${with_osi_lflags+set}" = set; then :
     21101  withval=$with_osi_lflags;
    2107821102fi
    2107921103
     
    2109621120
    2109721121  coin_has_osi=noInfo
    21098   osi_libs=
     21122  osi_lflags=
    2109921123  osi_cflags=
    2110021124  osi_data=
     
    2111821142      * )
    2111921143        coin_has_osi=yes
    21120         osi_libs=$withval
     21144        osi_lflags=$withval
    2112121145        ;;
    2112221146    esac
     
    2112821152
    2112921153  if test "$coin_has_osi" != skipping ; then
    21130        withval=$with_osi_lib
     21154       withval=$with_osi_lflags
    2113121155       if test -n "$withval" ; then
    2113221156         case "$withval" in
     
    2113621160           * )
    2113721161             coin_has_osi=yes
    21138              osi_libs=$withval
     21162             osi_lflags=$withval
    2113921163             ;;
    2114021164         esac
     
    2123921263      { $as_echo "$as_me:${as_lineno-$LINENO}: Collected values for package 'osi'" >&5
    2124021264$as_echo "$as_me: Collected values for package 'osi'" >&6;}
    21241       { $as_echo "$as_me:${as_lineno-$LINENO}: osi_libs is \"$osi_libs\"" >&5
    21242 $as_echo "$as_me: osi_libs is \"$osi_libs\"" >&6;}
     21265      { $as_echo "$as_me:${as_lineno-$LINENO}: osi_lflags is \"$osi_lflags\"" >&5
     21266$as_echo "$as_me: osi_lflags is \"$osi_lflags\"" >&6;}
    2124321267      { $as_echo "$as_me:${as_lineno-$LINENO}: osi_cflags is \"$osi_cflags\"" >&5
    2124421268$as_echo "$as_me: osi_cflags is \"$osi_cflags\"" >&6;}
     
    2127521299
    2127621300# If we've located the package, define preprocessor symbol COIN_HAS_PRIM and
    21277 # augment the necessary variables for the client packages. We need the final
    21278 # ':' (noop) below because it's possible that the list of client packages
    21279 # is empty.
     21301# augment the necessary variables for the client packages.
    2128021302
    2128121303  if test $coin_has_osi = yes ; then
     
    2128321305$as_echo "#define COIN_HAS_OSI 1" >>confdefs.h
    2128421306
    21285     if test $pubpriv = private ; then
    21286       OSICLPLIB_PCFILES="$osi_pcfiles $OSICLPLIB_PCFILES"
    21287          OSICLPLIB_LIBS="$osi_libs $OSICLPLIB_LIBS"
    21288          OSICLPLIB_CFLAGS="$osi_cflags $OSICLPLIB_CFLAGS"
    21289       :
    21290     else
    21291       OSICLPLIB_PCFILES_PUB="$osi_pcfiles $OSICLPLIB_PCFILES"_PUB
    21292          OSICLPLIB_LIBS_PUB="$osi_libs $OSICLPLIB_LIBS_PUB"
    21293          OSICLPLIB_CFLAGS_PUB="$osi_cflags $OSICLPLIB_CFLAGS_PUB"
    21294       :
    21295     fi
     21307    OSICLPLIB_PCFILES="$osi_pcfiles $OSICLPLIB_PCFILES"
     21308       OSICLPLIB_LFLAGS="$osi_lflags $OSICLPLIB_LFLAGS"
     21309       OSICLPLIB_CFLAGS="$osi_cflags $OSICLPLIB_CFLAGS"
    2129621310
    2129721311# Finally, set up PRIM_DATA, unless the user specified nodata.
     
    2130621320$as_echo_n "checking for package OsiTests... " >&6; }
    2130721321
    21308   pubpriv=private
    21309 
    2131021322# Make sure the necessary variables exist for each client package.
    2131121323
     
    2131421326
    2131521327
    21316 
    21317 
    21318 
    21319 # Check to see if the user has overridden configure parameters from the
    21320 # environment.
     21328# Check to see if the user has set an override to skip this primary.
    2132121329
    2132221330  coin_has_ositests=noInfo
     
    2132921337  fi
    2133021338
    21331 # If we're not skipping this project, define and process the command line
     21339# If we're not skipping this primary, define and process the command line
    2133221340# options according to the cmdopts parameter. Then invoke FIND_PRIM_PKG to do
    2133321341# the heavy lifting.
     
    2134521353
    2134621354
    21347 # Check whether --with-ositests-libs was given.
    21348 if test "${with_ositests_libs+set}" = set; then :
    21349   withval=$with_ositests_libs;
     21355# Check whether --with-ositests-lflags was given.
     21356if test "${with_ositests_lflags+set}" = set; then :
     21357  withval=$with_ositests_lflags;
    2135021358fi
    2135121359
     
    2136821376
    2136921377  coin_has_ositests=noInfo
    21370   ositests_libs=
     21378  ositests_lflags=
    2137121379  ositests_cflags=
    2137221380  ositests_data=
     
    2139021398      * )
    2139121399        coin_has_ositests=yes
    21392         ositests_libs=$withval
     21400        ositests_lflags=$withval
    2139321401        ;;
    2139421402    esac
     
    2140021408
    2140121409  if test "$coin_has_ositests" != skipping ; then
    21402        withval=$with_ositests_lib
     21410       withval=$with_ositests_lflags
    2140321411       if test -n "$withval" ; then
    2140421412         case "$withval" in
     
    2140821416           * )
    2140921417             coin_has_ositests=yes
    21410              ositests_libs=$withval
     21418             ositests_lflags=$withval
    2141121419             ;;
    2141221420         esac
     
    2150721515      { $as_echo "$as_me:${as_lineno-$LINENO}: Collected values for package 'ositests'" >&5
    2150821516$as_echo "$as_me: Collected values for package 'ositests'" >&6;}
    21509       { $as_echo "$as_me:${as_lineno-$LINENO}: ositests_libs is \"$ositests_libs\"" >&5
    21510 $as_echo "$as_me: ositests_libs is \"$ositests_libs\"" >&6;}
     21517      { $as_echo "$as_me:${as_lineno-$LINENO}: ositests_lflags is \"$ositests_lflags\"" >&5
     21518$as_echo "$as_me: ositests_lflags is \"$ositests_lflags\"" >&6;}
    2151121519      { $as_echo "$as_me:${as_lineno-$LINENO}: ositests_cflags is \"$ositests_cflags\"" >&5
    2151221520$as_echo "$as_me: ositests_cflags is \"$ositests_cflags\"" >&6;}
     
    2154321551
    2154421552# If we've located the package, define preprocessor symbol COIN_HAS_PRIM and
    21545 # augment the necessary variables for the client packages. We need the final
    21546 # ':' (noop) below because it's possible that the list of client packages
    21547 # is empty.
     21553# augment the necessary variables for the client packages.
    2154821554
    2154921555  if test $coin_has_ositests = yes ; then
     
    2155121557$as_echo "#define COIN_HAS_OSITESTS 1" >>confdefs.h
    2155221558
    21553     if test $pubpriv = private ; then
    21554       OSICLPUNITTEST_PCFILES="$ositests_pcfiles $OSICLPUNITTEST_PCFILES"
    21555          OSICLPUNITTEST_LIBS="$ositests_libs $OSICLPUNITTEST_LIBS"
    21556          OSICLPUNITTEST_CFLAGS="$ositests_cflags $OSICLPUNITTEST_CFLAGS"
    21557       :
    21558     else
    21559       OSICLPUNITTEST_PCFILES_PUB="$ositests_pcfiles $OSICLPUNITTEST_PCFILES"_PUB
    21560          OSICLPUNITTEST_LIBS_PUB="$ositests_libs $OSICLPUNITTEST_LIBS_PUB"
    21561          OSICLPUNITTEST_CFLAGS_PUB="$ositests_cflags $OSICLPUNITTEST_CFLAGS_PUB"
    21562       :
    21563     fi
     21559    OSICLPUNITTEST_PCFILES="$ositests_pcfiles $OSICLPUNITTEST_PCFILES"
     21560       OSICLPUNITTEST_LFLAGS="$ositests_lflags $OSICLPUNITTEST_LFLAGS"
     21561       OSICLPUNITTEST_CFLAGS="$ositests_cflags $OSICLPUNITTEST_CFLAGS"
    2156421562
    2156521563# Finally, set up PRIM_DATA, unless the user specified nodata.
     
    2157421572$as_echo_n "checking for package Sample... " >&6; }
    2157521573
    21576   pubpriv=private
    21577 
    2157821574# Make sure the necessary variables exist for each client package.
    2157921575
    2158021576
    2158121577
    21582 # Check to see if the user has overridden configure parameters from the
    21583 # environment.
     21578# Check to see if the user has set an override to skip this primary.
    2158421579
    2158521580  coin_has_sample=noInfo
     
    2159221587  fi
    2159321588
    21594 # If we're not skipping this project, define and process the command line
     21589# If we're not skipping this primary, define and process the command line
    2159521590# options according to the cmdopts parameter. Then invoke FIND_PRIM_PKG to do
    2159621591# the heavy lifting.
     
    2162621621
    2162721622  coin_has_sample=noInfo
    21628   sample_libs=
     21623  sample_lflags=
    2162921624  sample_cflags=
    2163021625  sample_data=
     
    2175221747      { $as_echo "$as_me:${as_lineno-$LINENO}: Collected values for package 'sample'" >&5
    2175321748$as_echo "$as_me: Collected values for package 'sample'" >&6;}
    21754       { $as_echo "$as_me:${as_lineno-$LINENO}: sample_libs is \"$sample_libs\"" >&5
    21755 $as_echo "$as_me: sample_libs is \"$sample_libs\"" >&6;}
     21749      { $as_echo "$as_me:${as_lineno-$LINENO}: sample_lflags is \"$sample_lflags\"" >&5
     21750$as_echo "$as_me: sample_lflags is \"$sample_lflags\"" >&6;}
    2175621751      { $as_echo "$as_me:${as_lineno-$LINENO}: sample_cflags is \"$sample_cflags\"" >&5
    2175721752$as_echo "$as_me: sample_cflags is \"$sample_cflags\"" >&6;}
     
    2178821783
    2178921784# If we've located the package, define preprocessor symbol COIN_HAS_PRIM and
    21790 # augment the necessary variables for the client packages. We need the final
    21791 # ':' (noop) below because it's possible that the list of client packages
    21792 # is empty.
     21785# augment the necessary variables for the client packages.
    2179321786
    2179421787  if test $coin_has_sample = yes ; then
     
    2179621789$as_echo "#define COIN_HAS_SAMPLE 1" >>confdefs.h
    2179721790
    21798     if test $pubpriv = private ; then
    21799 
    21800       :
    21801     else
    21802 
    21803       :
    21804     fi
     21791
    2180521792
    2180621793# Finally, set up PRIM_DATA, unless the user specified nodata.
     
    2181621803$as_echo_n "checking for package Netlib... " >&6; }
    2181721804
    21818   pubpriv=private
    21819 
    2182021805# Make sure the necessary variables exist for each client package.
    2182121806
    2182221807
    2182321808
    21824 # Check to see if the user has overridden configure parameters from the
    21825 # environment.
     21809# Check to see if the user has set an override to skip this primary.
    2182621810
    2182721811  coin_has_netlib=noInfo
     
    2183421818  fi
    2183521819
    21836 # If we're not skipping this project, define and process the command line
     21820# If we're not skipping this primary, define and process the command line
    2183721821# options according to the cmdopts parameter. Then invoke FIND_PRIM_PKG to do
    2183821822# the heavy lifting.
     
    2186821852
    2186921853  coin_has_netlib=noInfo
    21870   netlib_libs=
     21854  netlib_lflags=
    2187121855  netlib_cflags=
    2187221856  netlib_data=
     
    2199421978      { $as_echo "$as_me:${as_lineno-$LINENO}: Collected values for package 'netlib'" >&5
    2199521979$as_echo "$as_me: Collected values for package 'netlib'" >&6;}
    21996       { $as_echo "$as_me:${as_lineno-$LINENO}: netlib_libs is \"$netlib_libs\"" >&5
    21997 $as_echo "$as_me: netlib_libs is \"$netlib_libs\"" >&6;}
     21980      { $as_echo "$as_me:${as_lineno-$LINENO}: netlib_lflags is \"$netlib_lflags\"" >&5
     21981$as_echo "$as_me: netlib_lflags is \"$netlib_lflags\"" >&6;}
    2199821982      { $as_echo "$as_me:${as_lineno-$LINENO}: netlib_cflags is \"$netlib_cflags\"" >&5
    2199921983$as_echo "$as_me: netlib_cflags is \"$netlib_cflags\"" >&6;}
     
    2203022014
    2203122015# If we've located the package, define preprocessor symbol COIN_HAS_PRIM and
    22032 # augment the necessary variables for the client packages. We need the final
    22033 # ':' (noop) below because it's possible that the list of client packages
    22034 # is empty.
     22016# augment the necessary variables for the client packages.
    2203522017
    2203622018  if test $coin_has_netlib = yes ; then
     
    2203822020$as_echo "#define COIN_HAS_NETLIB 1" >>confdefs.h
    2203922021
    22040     if test $pubpriv = private ; then
    22041 
    22042       :
    22043     else
    22044 
    22045       :
    22046     fi
     22022
    2204722023
    2204822024# Finally, set up PRIM_DATA, unless the user specified nodata.
     
    2210722083$as_echo_n "checking for package AMD... " >&6; }
    2210822084
    22109   pubpriv=private
    22110 
    2211122085# Make sure the necessary variables exist for each client package.
    22112 
    22113 
    2211422086
    2211522087
     
    2214422116
    2214522117
    22146 # Check whether --with-amd-libs was given.
    22147 if test "${with_amd_libs+set}" = set; then :
    22148   withval=$with_amd_libs;
     22118# Check whether --with-amd-lflags was given.
     22119if test "${with_amd_lflags+set}" = set; then :
     22120  withval=$with_amd_lflags;
    2214922121fi
    2215022122
     
    2216522137
    2216622138  coin_has_amd=noInfo
    22167   amd_libs=
     22139  amd_lflags=
    2216822140  amd_cflags=
    2216922141  amd_data=
     
    2219122163  fi
    2219222164
    22193 # --with-prim-libs and --with-prim-cflags are present unless the client
     22165# --with-prim-lflags and --with-prim-cflags are present unless the client
    2219422166# specified dataonly. Specifying --with-prim=no overrides the individual
    22195 # options for libs and cflags.
     22167# options for lflags and cflags.
    2219622168
    2219722169  if test "$coin_has_amd" != skipping ; then
    22198        withval=$with_amd_lib
     22170       withval=$with_amd_lflags
    2219922171       if test -n "$withval" ; then
    2220022172         case "$withval" in
     
    2225722229  case $coin_has_amd in
    2225822230    build | requested)
    22259       amd_libs=-lamd
     22231      amd_lflags=-lamd
    2226022232         amd_cflags=-I/usr/include/suitesparse
    2226122233
     
    2228122253      { $as_echo "$as_me:${as_lineno-$LINENO}: Collected values for package 'amd'" >&5
    2228222254$as_echo "$as_me: Collected values for package 'amd'" >&6;}
    22283       { $as_echo "$as_me:${as_lineno-$LINENO}: amd_libs is \"$amd_libs\"" >&5
    22284 $as_echo "$as_me: amd_libs is \"$amd_libs\"" >&6;}
     22255      { $as_echo "$as_me:${as_lineno-$LINENO}: amd_lflags is \"$amd_lflags\"" >&5
     22256$as_echo "$as_me: amd_lflags is \"$amd_lflags\"" >&6;}
    2228522257      { $as_echo "$as_me:${as_lineno-$LINENO}: amd_cflags is \"$amd_cflags\"" >&5
    2228622258$as_echo "$as_me: amd_cflags is \"$amd_cflags\"" >&6;}
     
    2231722289
    2231822290# If we've located the package, define preprocessor symbol COIN_HAS_PRIM
    22319 # and augment the necessary variables for the client packages. We need the
    22320 # final ':' (noop) below because it's possible that PRIM is data-only and the
    22321 # list of client packages is empty.
     22291# and augment the necessary variables for the client packages.
    2232222292
    2232322293  if test $coin_has_amd = yes ; then
     
    2232522295$as_echo "#define COIN_HAS_AMD 1" >>confdefs.h
    2232622296
    22327     if test $pubpriv = private ; then
    22328       CLPLIB_LIBS="$amd_libs $CLPLIB_LIBS"
    22329          CLPLIB_CFLAGS="$amd_cflags $CLPLIB_CFLAGS"
    22330       :
    22331     else
    22332       CLPLIB_LIBS_PUB="$amd_libs $CLPLIB_LIBS_PUB"
    22333          CLPLIB_CFLAGS_PUB="$amd_cflags $CLPLIB_CFLAGS_PUB"
    22334       :
    22335     fi
     22297    CLPLIB_LFLAGS="$amd_lflags $CLPLIB_LFLAGS"
     22298       CLPLIB_CFLAGS="$amd_cflags $CLPLIB_CFLAGS"
    2233622299
    2233722300# Finally, set up PRIM_DATA, unless the user specified nodata.
     
    2234822311$as_echo_n "checking for package CHOLMOD... " >&6; }
    2234922312
    22350   pubpriv=private
    22351 
    2235222313# Make sure the necessary variables exist for each client package.
    22353 
    22354 
    2235522314
    2235622315
     
    2238522344
    2238622345
    22387 # Check whether --with-cholmod-libs was given.
    22388 if test "${with_cholmod_libs+set}" = set; then :
    22389   withval=$with_cholmod_libs;
     22346# Check whether --with-cholmod-lflags was given.
     22347if test "${with_cholmod_lflags+set}" = set; then :
     22348  withval=$with_cholmod_lflags;
    2239022349fi
    2239122350
     
    2240622365
    2240722366  coin_has_cholmod=noInfo
    22408   cholmod_libs=
     22367  cholmod_lflags=
    2240922368  cholmod_cflags=
    2241022369  cholmod_data=
     
    2243222391  fi
    2243322392
    22434 # --with-prim-libs and --with-prim-cflags are present unless the client
     22393# --with-prim-lflags and --with-prim-cflags are present unless the client
    2243522394# specified dataonly. Specifying --with-prim=no overrides the individual
    22436 # options for libs and cflags.
     22395# options for lflags and cflags.
    2243722396
    2243822397  if test "$coin_has_cholmod" != skipping ; then
    22439        withval=$with_cholmod_lib
     22398       withval=$with_cholmod_lflags
    2244022399       if test -n "$withval" ; then
    2244122400         case "$withval" in
     
    2249822457  case $coin_has_cholmod in
    2249922458    build | requested)
    22500       cholmod_libs=-lcholmod
     22459      cholmod_lflags=-lcholmod
    2250122460         cholmod_cflags=-I/usr/include/suitesparse
    2250222461
     
    2252222481      { $as_echo "$as_me:${as_lineno-$LINENO}: Collected values for package 'cholmod'" >&5
    2252322482$as_echo "$as_me: Collected values for package 'cholmod'" >&6;}
    22524       { $as_echo "$as_me:${as_lineno-$LINENO}: cholmod_libs is \"$cholmod_libs\"" >&5
    22525 $as_echo "$as_me: cholmod_libs is \"$cholmod_libs\"" >&6;}
     22483      { $as_echo "$as_me:${as_lineno-$LINENO}: cholmod_lflags is \"$cholmod_lflags\"" >&5
     22484$as_echo "$as_me: cholmod_lflags is \"$cholmod_lflags\"" >&6;}
    2252622485      { $as_echo "$as_me:${as_lineno-$LINENO}: cholmod_cflags is \"$cholmod_cflags\"" >&5
    2252722486$as_echo "$as_me: cholmod_cflags is \"$cholmod_cflags\"" >&6;}
     
    2255822517
    2255922518# If we've located the package, define preprocessor symbol COIN_HAS_PRIM
    22560 # and augment the necessary variables for the client packages. We need the
    22561 # final ':' (noop) below because it's possible that PRIM is data-only and the
    22562 # list of client packages is empty.
     22519# and augment the necessary variables for the client packages.
    2256322520
    2256422521  if test $coin_has_cholmod = yes ; then
     
    2256622523$as_echo "#define COIN_HAS_CHOLMOD 1" >>confdefs.h
    2256722524
    22568     if test $pubpriv = private ; then
    22569       CLPLIB_LIBS="$cholmod_libs $CLPLIB_LIBS"
    22570          CLPLIB_CFLAGS="$cholmod_cflags $CLPLIB_CFLAGS"
    22571       :
    22572     else
    22573       CLPLIB_LIBS_PUB="$cholmod_libs $CLPLIB_LIBS_PUB"
    22574          CLPLIB_CFLAGS_PUB="$cholmod_cflags $CLPLIB_CFLAGS_PUB"
    22575       :
    22576     fi
     22525    CLPLIB_LFLAGS="$cholmod_lflags $CLPLIB_LFLAGS"
     22526       CLPLIB_CFLAGS="$cholmod_cflags $CLPLIB_CFLAGS"
    2257722527
    2257822528# Finally, set up PRIM_DATA, unless the user specified nodata.
     
    2259122541$as_echo_n "checking for package Glpk... " >&6; }
    2259222542
    22593   pubpriv=private
    22594 
    2259522543# Make sure the necessary variables exist for each client package.
    2259622544
     
    2259922547
    2260022548
    22601 
    22602 
    22603 
    22604 # Check to see if the user has overridden configure parameters from the
    22605 # environment.
     22549# Check to see if the user has set an override to skip this primary.
    2260622550
    2260722551  coin_has_glpk=noInfo
     
    2261422558  fi
    2261522559
    22616 # If we're not skipping this project, define and process the command line
     22560# If we're not skipping this primary, define and process the command line
    2261722561# options according to the cmdopts parameter. Then invoke FIND_PRIM_PKG to do
    2261822562# the heavy lifting.
     
    2263022574
    2263122575
    22632 # Check whether --with-glpk-libs was given.
    22633 if test "${with_glpk_libs+set}" = set; then :
    22634   withval=$with_glpk_libs;
     22576# Check whether --with-glpk-lflags was given.
     22577if test "${with_glpk_lflags+set}" = set; then :
     22578  withval=$with_glpk_lflags;
    2263522579fi
    2263622580
     
    2265322597
    2265422598  coin_has_glpk=noInfo
    22655   glpk_libs=
     22599  glpk_lflags=
    2265622600  glpk_cflags=
    2265722601  glpk_data=
     
    2267522619      * )
    2267622620        coin_has_glpk=yes
    22677         glpk_libs=$withval
     22621        glpk_lflags=$withval
    2267822622        ;;
    2267922623    esac
     
    2268522629
    2268622630  if test "$coin_has_glpk" != skipping ; then
    22687        withval=$with_glpk_lib
     22631       withval=$with_glpk_lflags
    2268822632       if test -n "$withval" ; then
    2268922633         case "$withval" in
     
    2269322637           * )
    2269422638             coin_has_glpk=yes
    22695              glpk_libs=$withval
     22639             glpk_lflags=$withval
    2269622640             ;;
    2269722641         esac
     
    2279222736      { $as_echo "$as_me:${as_lineno-$LINENO}: Collected values for package 'glpk'" >&5
    2279322737$as_echo "$as_me: Collected values for package 'glpk'" >&6;}
    22794       { $as_echo "$as_me:${as_lineno-$LINENO}: glpk_libs is \"$glpk_libs\"" >&5
    22795 $as_echo "$as_me: glpk_libs is \"$glpk_libs\"" >&6;}
     22738      { $as_echo "$as_me:${as_lineno-$LINENO}: glpk_lflags is \"$glpk_lflags\"" >&5
     22739$as_echo "$as_me: glpk_lflags is \"$glpk_lflags\"" >&6;}
    2279622740      { $as_echo "$as_me:${as_lineno-$LINENO}: glpk_cflags is \"$glpk_cflags\"" >&5
    2279722741$as_echo "$as_me: glpk_cflags is \"$glpk_cflags\"" >&6;}
     
    2282822772
    2282922773# If we've located the package, define preprocessor symbol COIN_HAS_PRIM and
    22830 # augment the necessary variables for the client packages. We need the final
    22831 # ':' (noop) below because it's possible that the list of client packages
    22832 # is empty.
     22774# augment the necessary variables for the client packages.
    2283322775
    2283422776  if test $coin_has_glpk = yes ; then
     
    2283622778$as_echo "#define COIN_HAS_GLPK 1" >>confdefs.h
    2283722779
    22838     if test $pubpriv = private ; then
    22839       CLPLIB_PCFILES="$glpk_pcfiles $CLPLIB_PCFILES"
    22840          CLPLIB_LIBS="$glpk_libs $CLPLIB_LIBS"
    22841          CLPLIB_CFLAGS="$glpk_cflags $CLPLIB_CFLAGS"
    22842       :
    22843     else
    22844       CLPLIB_PCFILES_PUB="$glpk_pcfiles $CLPLIB_PCFILES"_PUB
    22845          CLPLIB_LIBS_PUB="$glpk_libs $CLPLIB_LIBS_PUB"
    22846          CLPLIB_CFLAGS_PUB="$glpk_cflags $CLPLIB_CFLAGS_PUB"
    22847       :
    22848     fi
     22780    CLPLIB_PCFILES="$glpk_pcfiles $CLPLIB_PCFILES"
     22781       CLPLIB_LFLAGS="$glpk_lflags $CLPLIB_LFLAGS"
     22782       CLPLIB_CFLAGS="$glpk_cflags $CLPLIB_CFLAGS"
    2284922783
    2285022784# Finally, set up PRIM_DATA, unless the user specified nodata.
     
    2287922813$as_echo_n "checking for package Mumps... " >&6; }
    2288022814
    22881   pubpriv=private
    22882 
    2288322815# Make sure the necessary variables exist for each client package.
    2288422816
     
    2288722819
    2288822820
    22889 
    22890 
    22891 
    22892 # Check to see if the user has overridden configure parameters from the
    22893 # environment.
     22821# Check to see if the user has set an override to skip this primary.
    2289422822
    2289522823  coin_has_mumps=noInfo
     
    2290222830  fi
    2290322831
    22904 # If we're not skipping this project, define and process the command line
     22832# If we're not skipping this primary, define and process the command line
    2290522833# options according to the cmdopts parameter. Then invoke FIND_PRIM_PKG to do
    2290622834# the heavy lifting.
     
    2291822846
    2291922847
    22920 # Check whether --with-mumps-libs was given.
    22921 if test "${with_mumps_libs+set}" = set; then :
    22922   withval=$with_mumps_libs;
     22848# Check whether --with-mumps-lflags was given.
     22849if test "${with_mumps_lflags+set}" = set; then :
     22850  withval=$with_mumps_lflags;
    2292322851fi
    2292422852
     
    2294122869
    2294222870  coin_has_mumps=noInfo
    22943   mumps_libs=
     22871  mumps_lflags=
    2294422872  mumps_cflags=
    2294522873  mumps_data=
     
    2296322891      * )
    2296422892        coin_has_mumps=yes
    22965         mumps_libs=$withval
     22893        mumps_lflags=$withval
    2296622894        ;;
    2296722895    esac
     
    2297322901
    2297422902  if test "$coin_has_mumps" != skipping ; then
    22975        withval=$with_mumps_lib
     22903       withval=$with_mumps_lflags
    2297622904       if test -n "$withval" ; then
    2297722905         case "$withval" in
     
    2298122909           * )
    2298222910             coin_has_mumps=yes
    22983              mumps_libs=$withval
     22911             mumps_lflags=$withval
    2298422912             ;;
    2298522913         esac
     
    2308023008      { $as_echo "$as_me:${as_lineno-$LINENO}: Collected values for package 'mumps'" >&5
    2308123009$as_echo "$as_me: Collected values for package 'mumps'" >&6;}
    23082       { $as_echo "$as_me:${as_lineno-$LINENO}: mumps_libs is \"$mumps_libs\"" >&5
    23083 $as_echo "$as_me: mumps_libs is \"$mumps_libs\"" >&6;}
     23010      { $as_echo "$as_me:${as_lineno-$LINENO}: mumps_lflags is \"$mumps_lflags\"" >&5
     23011$as_echo "$as_me: mumps_lflags is \"$mumps_lflags\"" >&6;}
    2308423012      { $as_echo "$as_me:${as_lineno-$LINENO}: mumps_cflags is \"$mumps_cflags\"" >&5
    2308523013$as_echo "$as_me: mumps_cflags is \"$mumps_cflags\"" >&6;}
     
    2311623044
    2311723045# If we've located the package, define preprocessor symbol COIN_HAS_PRIM and
    23118 # augment the necessary variables for the client packages. We need the final
    23119 # ':' (noop) below because it's possible that the list of client packages
    23120 # is empty.
     23046# augment the necessary variables for the client packages.
    2312123047
    2312223048  if test $coin_has_mumps = yes ; then
     
    2312423050$as_echo "#define COIN_HAS_MUMPS 1" >>confdefs.h
    2312523051
    23126     if test $pubpriv = private ; then
    23127       CLPLIB_PCFILES="$mumps_pcfiles $CLPLIB_PCFILES"
    23128          CLPLIB_LIBS="$mumps_libs $CLPLIB_LIBS"
    23129          CLPLIB_CFLAGS="$mumps_cflags $CLPLIB_CFLAGS"
    23130       :
    23131     else
    23132       CLPLIB_PCFILES_PUB="$mumps_pcfiles $CLPLIB_PCFILES"_PUB
    23133          CLPLIB_LIBS_PUB="$mumps_libs $CLPLIB_LIBS_PUB"
    23134          CLPLIB_CFLAGS_PUB="$mumps_cflags $CLPLIB_CFLAGS_PUB"
    23135       :
    23136     fi
     23052    CLPLIB_PCFILES="$mumps_pcfiles $CLPLIB_PCFILES"
     23053       CLPLIB_LFLAGS="$mumps_lflags $CLPLIB_LFLAGS"
     23054       CLPLIB_CFLAGS="$mumps_cflags $CLPLIB_CFLAGS"
    2313723055
    2313823056# Finally, set up PRIM_DATA, unless the user specified nodata.
     
    2314823066$as_echo_n "checking for package WSMP... " >&6; }
    2314923067
    23150   pubpriv=private
    23151 
    2315223068# Make sure the necessary variables exist for each client package.
    23153 
    23154 
    2315523069
    2315623070
     
    2318523099
    2318623100
    23187 # Check whether --with-wsmp-libs was given.
    23188 if test "${with_wsmp_libs+set}" = set; then :
    23189   withval=$with_wsmp_libs;
     23101# Check whether --with-wsmp-lflags was given.
     23102if test "${with_wsmp_lflags+set}" = set; then :
     23103  withval=$with_wsmp_lflags;
    2319023104fi
    2319123105
     
    2320623120
    2320723121  coin_has_wsmp=noInfo
    23208   wsmp_libs=
     23122  wsmp_lflags=
    2320923123  wsmp_cflags=
    2321023124  wsmp_data=
     
    2323223146  fi
    2323323147
    23234 # --with-prim-libs and --with-prim-cflags are present unless the client
     23148# --with-prim-lflags and --with-prim-cflags are present unless the client
    2323523149# specified dataonly. Specifying --with-prim=no overrides the individual
    23236 # options for libs and cflags.
     23150# options for lflags and cflags.
    2323723151
    2323823152  if test "$coin_has_wsmp" != skipping ; then
    23239        withval=$with_wsmp_lib
     23153       withval=$with_wsmp_lflags
    2324023154       if test -n "$withval" ; then
    2324123155         case "$withval" in
     
    2329923213    build | requested)
    2330023214      if test "$coin_has_wsmp" = build ; then
    23301               wsmp_libs="-L\$(libdir) -lcoinwsmp"
     23215              wsmp_lflags="-L\$(libdir) -lcoinwsmp"
    2330223216            else
    23303               wsmp_libs="-lwsmp"
     23217              wsmp_lflags="-lwsmp"
    2330423218            fi
    2330523219         if test "$coin_has_wsmp" = build ; then
     
    2332823242      { $as_echo "$as_me:${as_lineno-$LINENO}: Collected values for package 'wsmp'" >&5
    2332923243$as_echo "$as_me: Collected values for package 'wsmp'" >&6;}
    23330       { $as_echo "$as_me:${as_lineno-$LINENO}: wsmp_libs is \"$wsmp_libs\"" >&5
    23331 $as_echo "$as_me: wsmp_libs is \"$wsmp_libs\"" >&6;}
     23244      { $as_echo "$as_me:${as_lineno-$LINENO}: wsmp_lflags is \"$wsmp_lflags\"" >&5
     23245$as_echo "$as_me: wsmp_lflags is \"$wsmp_lflags\"" >&6;}
    2333223246      { $as_echo "$as_me:${as_lineno-$LINENO}: wsmp_cflags is \"$wsmp_cflags\"" >&5
    2333323247$as_echo "$as_me: wsmp_cflags is \"$wsmp_cflags\"" >&6;}
     
    2336423278
    2336523279# If we've located the package, define preprocessor symbol COIN_HAS_PRIM
    23366 # and augment the necessary variables for the client packages. We need the
    23367 # final ':' (noop) below because it's possible that PRIM is data-only and the
    23368 # list of client packages is empty.
     23280# and augment the necessary variables for the client packages.
    2336923281
    2337023282  if test $coin_has_wsmp = yes ; then
     
    2337223284$as_echo "#define COIN_HAS_WSMP 1" >>confdefs.h
    2337323285
    23374     if test $pubpriv = private ; then
    23375       CLPLIB_LIBS="$wsmp_libs $CLPLIB_LIBS"
    23376          CLPLIB_CFLAGS="$wsmp_cflags $CLPLIB_CFLAGS"
    23377       :
    23378     else
    23379       CLPLIB_LIBS_PUB="$wsmp_libs $CLPLIB_LIBS_PUB"
    23380          CLPLIB_CFLAGS_PUB="$wsmp_cflags $CLPLIB_CFLAGS_PUB"
    23381       :
    23382     fi
     23286    CLPLIB_LFLAGS="$wsmp_lflags $CLPLIB_LFLAGS"
     23287       CLPLIB_CFLAGS="$wsmp_cflags $CLPLIB_CFLAGS"
    2338323288
    2338423289# Finally, set up PRIM_DATA, unless the user specified nodata.
     
    2364723552$as_echo_n "checking for package ASL... " >&6; }
    2364823553
    23649   pubpriv=private
    23650 
    2365123554# Make sure the necessary variables exist for each client package.
    2365223555
     
    2365523558
    2365623559
    23657 
    23658 
    23659 
    23660 # Check to see if the user has overridden configure parameters from the
    23661 # environment.
     23560# Check to see if the user has set an override to skip this primary.
    2366223561
    2366323562  coin_has_asl=noInfo
     
    2367023569  fi
    2367123570
    23672 # If we're not skipping this project, define and process the command line
     23571# If we're not skipping this primary, define and process the command line
    2367323572# options according to the cmdopts parameter. Then invoke FIND_PRIM_PKG to do
    2367423573# the heavy lifting.
     
    2368623585
    2368723586
    23688 # Check whether --with-asl-libs was given.
    23689 if test "${with_asl_libs+set}" = set; then :
    23690   withval=$with_asl_libs;
     23587# Check whether --with-asl-lflags was given.
     23588if test "${with_asl_lflags+set}" = set; then :
     23589  withval=$with_asl_lflags;
    2369123590fi
    2369223591
     
    2370923608
    2371023609  coin_has_asl=noInfo
    23711   asl_libs=
     23610  asl_lflags=
    2371223611  asl_cflags=
    2371323612  asl_data=
     
    2373123630      * )
    2373223631        coin_has_asl=yes
    23733         asl_libs=$withval
     23632        asl_lflags=$withval
    2373423633        ;;
    2373523634    esac
     
    2374123640
    2374223641  if test "$coin_has_asl" != skipping ; then
    23743        withval=$with_asl_lib
     23642       withval=$with_asl_lflags
    2374423643       if test -n "$withval" ; then
    2374523644         case "$withval" in
     
    2374923648           * )
    2375023649             coin_has_asl=yes
    23751              asl_libs=$withval
     23650             asl_lflags=$withval
    2375223651             ;;
    2375323652         esac
     
    2384823747      { $as_echo "$as_me:${as_lineno-$LINENO}: Collected values for package 'asl'" >&5
    2384923748$as_echo "$as_me: Collected values for package 'asl'" >&6;}
    23850       { $as_echo "$as_me:${as_lineno-$LINENO}: asl_libs is \"$asl_libs\"" >&5
    23851 $as_echo "$as_me: asl_libs is \"$asl_libs\"" >&6;}
     23749      { $as_echo "$as_me:${as_lineno-$LINENO}: asl_lflags is \"$asl_lflags\"" >&5
     23750$as_echo "$as_me: asl_lflags is \"$asl_lflags\"" >&6;}
    2385223751      { $as_echo "$as_me:${as_lineno-$LINENO}: asl_cflags is \"$asl_cflags\"" >&5
    2385323752$as_echo "$as_me: asl_cflags is \"$asl_cflags\"" >&6;}
     
    2388423783
    2388523784# If we've located the package, define preprocessor symbol COIN_HAS_PRIM and
    23886 # augment the necessary variables for the client packages. We need the final
    23887 # ':' (noop) below because it's possible that the list of client packages
    23888 # is empty.
     23785# augment the necessary variables for the client packages.
    2388923786
    2389023787  if test $coin_has_asl = yes ; then
     
    2389223789$as_echo "#define COIN_HAS_ASL 1" >>confdefs.h
    2389323790
    23894     if test $pubpriv = private ; then
    23895       CLPLIB_PCFILES="$asl_pcfiles $CLPLIB_PCFILES"
    23896          CLPLIB_LIBS="$asl_libs $CLPLIB_LIBS"
    23897          CLPLIB_CFLAGS="$asl_cflags $CLPLIB_CFLAGS"
    23898       :
    23899     else
    23900       CLPLIB_PCFILES_PUB="$asl_pcfiles $CLPLIB_PCFILES"_PUB
    23901          CLPLIB_LIBS_PUB="$asl_libs $CLPLIB_LIBS_PUB"
    23902          CLPLIB_CFLAGS_PUB="$asl_cflags $CLPLIB_CFLAGS_PUB"
    23903       :
    23904     fi
     23791    CLPLIB_PCFILES="$asl_pcfiles $CLPLIB_PCFILES"
     23792       CLPLIB_LFLAGS="$asl_lflags $CLPLIB_LFLAGS"
     23793       CLPLIB_CFLAGS="$asl_cflags $CLPLIB_CFLAGS"
    2390523794
    2390623795# Finally, set up PRIM_DATA, unless the user specified nodata.
     
    2405923948    fi
    2406023949    if test $coin_has_readline = yes ; then
    24061       CLPLIB_LIBS="-lreadline $CLPLIB_LIBS"
     23950      CLPLIB_LFLAGS="-lreadline $CLPLIB_LFLAGS"
    2406223951
    2406323952$as_echo "#define COIN_HAS_READLINE 1" >>confdefs.h
     
    2436324252
    2436424253 if test 0 = 1; then
    24365   DEPENDENCY_LINKING_TRUE=
    24366   DEPENDENCY_LINKING_FALSE='#'
    24367 else
    24368   DEPENDENCY_LINKING_TRUE='#'
    24369   DEPENDENCY_LINKING_FALSE=
    24370 fi
    24371 
    24372  if test 0 = 1; then
    2437324254  COIN_CXX_IS_CL_TRUE=
    2437424255  COIN_CXX_IS_CL_FALSE='#'
     
    2438124262# Finalize libs and cflags.
    2438224263
    24383   if test -n "${CLPLIB_PCFILES}" ; then
    24384        temp_CFLAGS=`PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH" $PKG_CONFIG --cflags ${CLPLIB_PCFILES}`
    24385        temp_LIBS=`PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH" $PKG_CONFIG --libs ${CLPLIB_PCFILES}`
    24386        CLPLIB_CFLAGS="$temp_CFLAGS ${CLPLIB_CFLAGS}"
    24387        CLPLIB_LIBS="$temp_LIBS ${CLPLIB_LIBS}"
    24388      fi
     24264   if test 1 = 1 ; then
     24265        { $as_echo "$as_me:${as_lineno-$LINENO}: FINALIZE_FLAGS for ClpLib:" >&5
     24266$as_echo "$as_me: FINALIZE_FLAGS for ClpLib:" >&6;}
     24267      fi
     24268      CLPLIB_LFLAGS_NOPC=$CLPLIB_LFLAGS
     24269
     24270      CLPLIB_CFLAGS_NOPC=$CLPLIB_CFLAGS
     24271
     24272      if test -n "${CLPLIB_PCFILES}" ; then
     24273        temp_CFLAGS=`PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH" $PKG_CONFIG --cflags ${CLPLIB_PCFILES}`
     24274        temp_LFLAGS=`PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH" $PKG_CONFIG --libs ${CLPLIB_PCFILES}`
     24275        CLPLIB_CFLAGS="$temp_CFLAGS ${CLPLIB_CFLAGS}"
     24276        CLPLIB_LFLAGS="$temp_LFLAGS ${CLPLIB_LFLAGS}"
     24277      fi
    2438924278
    2439024279# Change the test to enable / disable debugging output
    2439124280
    24392      if test 1 = 1 ; then
    24393        { $as_echo "$as_me:${as_lineno-$LINENO}: FINALIZE_FLAGS for ClpLib: adding \"${CLPLIB_PCFILES}\"" >&5
    24394 $as_echo "$as_me: FINALIZE_FLAGS for ClpLib: adding \"${CLPLIB_PCFILES}\"" >&6;}
    24395        { $as_echo "$as_me:${as_lineno-$LINENO}: CLPLIB_LIBS is \"${CLPLIB_LIBS}\"" >&5
    24396 $as_echo "$as_me: CLPLIB_LIBS is \"${CLPLIB_LIBS}\"" >&6;}
    24397        { $as_echo "$as_me:${as_lineno-$LINENO}: CLPLIB_CFLAGS is \"${CLPLIB_CFLAGS}\"" >&5
    24398 $as_echo "$as_me: CLPLIB_CFLAGS is \"${CLPLIB_CFLAGS}\"" >&6;}
    24399      fi ; if test -n "${OSICLPLIB_PCFILES}" ; then
    24400        temp_CFLAGS=`PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH" $PKG_CONFIG --cflags ${OSICLPLIB_PCFILES}`
    24401        temp_LIBS=`PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH" $PKG_CONFIG --libs ${OSICLPLIB_PCFILES}`
    24402        OSICLPLIB_CFLAGS="$temp_CFLAGS ${OSICLPLIB_CFLAGS}"
    24403        OSICLPLIB_LIBS="$temp_LIBS ${OSICLPLIB_LIBS}"
    24404      fi
     24281      if test 1 = 1 ; then
     24282        { $as_echo "$as_me:${as_lineno-$LINENO}: CLPLIB_LFLAGS_NOPC: \"${CLPLIB_LFLAGS_NOPC}\"" >&5
     24283$as_echo "$as_me: CLPLIB_LFLAGS_NOPC: \"${CLPLIB_LFLAGS_NOPC}\"" >&6;}
     24284        { $as_echo "$as_me:${as_lineno-$LINENO}: CLPLIB_CFLAGS_NOPC: \"${CLPLIB_CFLAGS_NOPC}\"" >&5
     24285$as_echo "$as_me: CLPLIB_CFLAGS_NOPC: \"${CLPLIB_CFLAGS_NOPC}\"" >&6;}
     24286        { $as_echo "$as_me:${as_lineno-$LINENO}: adding \"${CLPLIB_PCFILES}\"" >&5
     24287$as_echo "$as_me: adding \"${CLPLIB_PCFILES}\"" >&6;}
     24288        { $as_echo "$as_me:${as_lineno-$LINENO}: CLPLIB_LFLAGS: \"${CLPLIB_LFLAGS}\"" >&5
     24289$as_echo "$as_me: CLPLIB_LFLAGS: \"${CLPLIB_LFLAGS}\"" >&6;}
     24290        { $as_echo "$as_me:${as_lineno-$LINENO}: CLPLIB_CFLAGS: \"${CLPLIB_CFLAGS}\"" >&5
     24291$as_echo "$as_me: CLPLIB_CFLAGS: \"${CLPLIB_CFLAGS}\"" >&6;}
     24292      fi ;  if test 1 = 1 ; then
     24293        { $as_echo "$as_me:${as_lineno-$LINENO}: FINALIZE_FLAGS for OsiClpLib:" >&5
     24294$as_echo "$as_me: FINALIZE_FLAGS for OsiClpLib:" >&6;}
     24295      fi
     24296      OSICLPLIB_LFLAGS_NOPC=$OSICLPLIB_LFLAGS
     24297
     24298      OSICLPLIB_CFLAGS_NOPC=$OSICLPLIB_CFLAGS
     24299
     24300      if test -n "${OSICLPLIB_PCFILES}" ; then
     24301        temp_CFLAGS=`PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH" $PKG_CONFIG --cflags ${OSICLPLIB_PCFILES}`
     24302        temp_LFLAGS=`PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH" $PKG_CONFIG --libs ${OSICLPLIB_PCFILES}`
     24303        OSICLPLIB_CFLAGS="$temp_CFLAGS ${OSICLPLIB_CFLAGS}"
     24304        OSICLPLIB_LFLAGS="$temp_LFLAGS ${OSICLPLIB_LFLAGS}"
     24305      fi
    2440524306
    2440624307# Change the test to enable / disable debugging output
    2440724308
    24408      if test 1 = 1 ; then
    24409        { $as_echo "$as_me:${as_lineno-$LINENO}: FINALIZE_FLAGS for OsiClpLib: adding \"${OSICLPLIB_PCFILES}\"" >&5
    24410 $as_echo "$as_me: FINALIZE_FLAGS for OsiClpLib: adding \"${OSICLPLIB_PCFILES}\"" >&6;}
    24411        { $as_echo "$as_me:${as_lineno-$LINENO}: OSICLPLIB_LIBS is \"${OSICLPLIB_LIBS}\"" >&5
    24412 $as_echo "$as_me: OSICLPLIB_LIBS is \"${OSICLPLIB_LIBS}\"" >&6;}
    24413        { $as_echo "$as_me:${as_lineno-$LINENO}: OSICLPLIB_CFLAGS is \"${OSICLPLIB_CFLAGS}\"" >&5
    24414 $as_echo "$as_me: OSICLPLIB_CFLAGS is \"${OSICLPLIB_CFLAGS}\"" >&6;}
    24415      fi ; if test -n "${OSICLPUNITTEST_PCFILES}" ; then
    24416        temp_CFLAGS=`PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH" $PKG_CONFIG --cflags ${OSICLPUNITTEST_PCFILES}`
    24417        temp_LIBS=`PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH" $PKG_CONFIG --libs ${OSICLPUNITTEST_PCFILES}`
    24418        OSICLPUNITTEST_CFLAGS="$temp_CFLAGS ${OSICLPUNITTEST_CFLAGS}"
    24419        OSICLPUNITTEST_LIBS="$temp_LIBS ${OSICLPUNITTEST_LIBS}"
    24420      fi
     24309      if test 1 = 1 ; then
     24310        { $as_echo "$as_me:${as_lineno-$LINENO}: OSICLPLIB_LFLAGS_NOPC: \"${OSICLPLIB_LFLAGS_NOPC}\"" >&5
     24311$as_echo "$as_me: OSICLPLIB_LFLAGS_NOPC: \"${OSICLPLIB_LFLAGS_NOPC}\"" >&6;}
     24312        { $as_echo "$as_me:${as_lineno-$LINENO}: OSICLPLIB_CFLAGS_NOPC: \"${OSICLPLIB_CFLAGS_NOPC}\"" >&5
     24313$as_echo "$as_me: OSICLPLIB_CFLAGS_NOPC: \"${OSICLPLIB_CFLAGS_NOPC}\"" >&6;}
     24314        { $as_echo "$as_me:${as_lineno-$LINENO}: adding \"${OSICLPLIB_PCFILES}\"" >&5
     24315$as_echo "$as_me: adding \"${OSICLPLIB_PCFILES}\"" >&6;}
     24316        { $as_echo "$as_me:${as_lineno-$LINENO}: OSICLPLIB_LFLAGS: \"${OSICLPLIB_LFLAGS}\"" >&5
     24317$as_echo "$as_me: OSICLPLIB_LFLAGS: \"${OSICLPLIB_LFLAGS}\"" >&6;}
     24318        { $as_echo "$as_me:${as_lineno-$LINENO}: OSICLPLIB_CFLAGS: \"${OSICLPLIB_CFLAGS}\"" >&5
     24319$as_echo "$as_me: OSICLPLIB_CFLAGS: \"${OSICLPLIB_CFLAGS}\"" >&6;}
     24320      fi ;  if test 1 = 1 ; then
     24321        { $as_echo "$as_me:${as_lineno-$LINENO}: FINALIZE_FLAGS for OsiClpUnitTest:" >&5
     24322$as_echo "$as_me: FINALIZE_FLAGS for OsiClpUnitTest:" >&6;}
     24323      fi
     24324      OSICLPUNITTEST_LFLAGS_NOPC=$OSICLPUNITTEST_LFLAGS
     24325
     24326      OSICLPUNITTEST_CFLAGS_NOPC=$OSICLPUNITTEST_CFLAGS
     24327
     24328      if test -n "${OSICLPUNITTEST_PCFILES}" ; then
     24329        temp_CFLAGS=`PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH" $PKG_CONFIG --cflags ${OSICLPUNITTEST_PCFILES}`
     24330        temp_LFLAGS=`PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH" $PKG_CONFIG --libs ${OSICLPUNITTEST_PCFILES}`
     24331        OSICLPUNITTEST_CFLAGS="$temp_CFLAGS ${OSICLPUNITTEST_CFLAGS}"
     24332        OSICLPUNITTEST_LFLAGS="$temp_LFLAGS ${OSICLPUNITTEST_LFLAGS}"
     24333      fi
    2442124334
    2442224335# Change the test to enable / disable debugging output
    2442324336
    24424      if test 1 = 1 ; then
    24425        { $as_echo "$as_me:${as_lineno-$LINENO}: FINALIZE_FLAGS for OsiClpUnitTest: adding \"${OSICLPUNITTEST_PCFILES}\"" >&5
    24426 $as_echo "$as_me: FINALIZE_FLAGS for OsiClpUnitTest: adding \"${OSICLPUNITTEST_PCFILES}\"" >&6;}
    24427        { $as_echo "$as_me:${as_lineno-$LINENO}: OSICLPUNITTEST_LIBS is \"${OSICLPUNITTEST_LIBS}\"" >&5
    24428 $as_echo "$as_me: OSICLPUNITTEST_LIBS is \"${OSICLPUNITTEST_LIBS}\"" >&6;}
    24429        { $as_echo "$as_me:${as_lineno-$LINENO}: OSICLPUNITTEST_CFLAGS is \"${OSICLPUNITTEST_CFLAGS}\"" >&5
    24430 $as_echo "$as_me: OSICLPUNITTEST_CFLAGS is \"${OSICLPUNITTEST_CFLAGS}\"" >&6;}
    24431      fi ;
     24337      if test 1 = 1 ; then
     24338        { $as_echo "$as_me:${as_lineno-$LINENO}: OSICLPUNITTEST_LFLAGS_NOPC: \"${OSICLPUNITTEST_LFLAGS_NOPC}\"" >&5
     24339$as_echo "$as_me: OSICLPUNITTEST_LFLAGS_NOPC: \"${OSICLPUNITTEST_LFLAGS_NOPC}\"" >&6;}
     24340        { $as_echo "$as_me:${as_lineno-$LINENO}: OSICLPUNITTEST_CFLAGS_NOPC: \"${OSICLPUNITTEST_CFLAGS_NOPC}\"" >&5
     24341$as_echo "$as_me: OSICLPUNITTEST_CFLAGS_NOPC: \"${OSICLPUNITTEST_CFLAGS_NOPC}\"" >&6;}
     24342        { $as_echo "$as_me:${as_lineno-$LINENO}: adding \"${OSICLPUNITTEST_PCFILES}\"" >&5
     24343$as_echo "$as_me: adding \"${OSICLPUNITTEST_PCFILES}\"" >&6;}
     24344        { $as_echo "$as_me:${as_lineno-$LINENO}: OSICLPUNITTEST_LFLAGS: \"${OSICLPUNITTEST_LFLAGS}\"" >&5
     24345$as_echo "$as_me: OSICLPUNITTEST_LFLAGS: \"${OSICLPUNITTEST_LFLAGS}\"" >&6;}
     24346        { $as_echo "$as_me:${as_lineno-$LINENO}: OSICLPUNITTEST_CFLAGS: \"${OSICLPUNITTEST_CFLAGS}\"" >&5
     24347$as_echo "$as_me: OSICLPUNITTEST_CFLAGS: \"${OSICLPUNITTEST_CFLAGS}\"" >&6;}
     24348      fi ;
     24349
     24350
     24351
     24352# Make sure the necessary variables exist for each client package.
     24353
     24354
     24355
     24356
     24357
     24358# Add the .pc file and augment LFLAGS and CFLAGS.
     24359
     24360    OSICLPLIB_PCFILES="$OSICLPLIB_PCFILES clp"
     24361       OSICLPLIB_LFLAGS="$OSICLPLIB_LFLAGS $CLPLIB_LFLAGS"
     24362       OSICLPLIB_CFLAGS="$OSICLPLIB_CFLAGS $CLPLIB_CFLAGS"
     24363
     24364# Change the test to enable / disable debugging output
     24365
     24366       if test 1 = 1 ; then
     24367         { $as_echo "$as_me:${as_lineno-$LINENO}: CHK_HERE adding ClpLib to OsiClpLib:" >&5
     24368$as_echo "$as_me: CHK_HERE adding ClpLib to OsiClpLib:" >&6;}
     24369         { $as_echo "$as_me:${as_lineno-$LINENO}: OSICLPLIB_PCFILES: \"${OSICLPLIB_PCFILES}\"" >&5
     24370$as_echo "$as_me: OSICLPLIB_PCFILES: \"${OSICLPLIB_PCFILES}\"" >&6;}
     24371         { $as_echo "$as_me:${as_lineno-$LINENO}: OSICLPLIB_LFLAGS: \"${OSICLPLIB_LFLAGS}\"" >&5
     24372$as_echo "$as_me: OSICLPLIB_LFLAGS: \"${OSICLPLIB_LFLAGS}\"" >&6;}
     24373         { $as_echo "$as_me:${as_lineno-$LINENO}: OSICLPLIB_CFLAGS: \"${OSICLPLIB_CFLAGS}\"" >&5
     24374$as_echo "$as_me: OSICLPLIB_CFLAGS: \"${OSICLPLIB_CFLAGS}\"" >&6;}
     24375       fi ;
     24376
    2443224377
    2443324378
     
    2443824383
    2443924384if test $coin_has_osi = yes ; then
    24440 
    24441   if test -n "${OSICLPLIB_PCFILES}" ; then
    24442        temp_CFLAGS=`PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH" $PKG_CONFIG --cflags ${OSICLPLIB_PCFILES}`
    24443        temp_LIBS=`PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH" $PKG_CONFIG --libs ${OSICLPLIB_PCFILES}`
    24444        OSICLPLIB_CFLAGS="$temp_CFLAGS ${OSICLPLIB_CFLAGS}"
    24445        OSICLPLIB_LIBS="$temp_LIBS ${OSICLPLIB_LIBS}"
    24446      fi
    24447 
    24448 # Change the test to enable / disable debugging output
    24449 
    24450      if test 1 = 1 ; then
    24451        { $as_echo "$as_me:${as_lineno-$LINENO}: FINALIZE_FLAGS for OsiClpLib: adding \"${OSICLPLIB_PCFILES}\"" >&5
    24452 $as_echo "$as_me: FINALIZE_FLAGS for OsiClpLib: adding \"${OSICLPLIB_PCFILES}\"" >&6;}
    24453        { $as_echo "$as_me:${as_lineno-$LINENO}: OSICLPLIB_LIBS is \"${OSICLPLIB_LIBS}\"" >&5
    24454 $as_echo "$as_me: OSICLPLIB_LIBS is \"${OSICLPLIB_LIBS}\"" >&6;}
    24455        { $as_echo "$as_me:${as_lineno-$LINENO}: OSICLPLIB_CFLAGS is \"${OSICLPLIB_CFLAGS}\"" >&5
    24456 $as_echo "$as_me: OSICLPLIB_CFLAGS is \"${OSICLPLIB_CFLAGS}\"" >&6;}
    24457      fi ;
    24458 
    2445924385  ac_config_files="$ac_config_files osi-clp.pc:src/OsiClp/osi-clp.pc.in"
    2446024386
     
    2461524541Usually this means the macro was only invoked conditionally." "$LINENO" 5
    2461624542fi
     24543if test -z "${DEPENDENCY_LINKING_TRUE}" && test -z "${DEPENDENCY_LINKING_FALSE}"; then
     24544  as_fn_error $? "conditional \"DEPENDENCY_LINKING\" was never defined.
     24545Usually this means the macro was only invoked conditionally." "$LINENO" 5
     24546fi
    2461724547if test -z "${COIN_HAS_PKGCONFIG_TRUE}" && test -z "${COIN_HAS_PKGCONFIG_FALSE}"; then
    2461824548  as_fn_error $? "conditional \"COIN_HAS_PKGCONFIG\" was never defined.
     
    2469324623if test -z "${COIN_HAS_LATEX_TRUE}" && test -z "${COIN_HAS_LATEX_FALSE}"; then
    2469424624  as_fn_error $? "conditional \"COIN_HAS_LATEX\" was never defined.
    24695 Usually this means the macro was only invoked conditionally." "$LINENO" 5
    24696 fi
    24697 if test -z "${DEPENDENCY_LINKING_TRUE}" && test -z "${DEPENDENCY_LINKING_FALSE}"; then
    24698   as_fn_error $? "conditional \"DEPENDENCY_LINKING\" was never defined.
    2469924625Usually this means the macro was only invoked conditionally." "$LINENO" 5
    2470024626fi
     
    2529625222double_quote_subst='$double_quote_subst'
    2529725223delay_variable_subst='$delay_variable_subst'
     25224macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`'
     25225macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`'
    2529825226enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`'
    2529925227enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`'
    25300 macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`'
    25301 macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`'
    2530225228pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`'
    2530325229enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'
     
    2651626442# ### BEGIN LIBTOOL CONFIG
    2651726443
    26518 # Whether or not to build shared libraries.
    26519 build_libtool_libs=$enable_shared
    26520 
    26521 # Whether or not to build static libraries.
    26522 build_old_libs=$enable_static
    26523 
    2652426444# Which release of libtool.m4 was used?
    2652526445macro_version=$macro_version
    2652626446macro_revision=$macro_revision
     26447
     26448# Whether or not to build shared libraries.
     26449build_libtool_libs=$enable_shared
     26450
     26451# Whether or not to build static libraries.
     26452build_old_libs=$enable_static
    2652726453
    2652826454# What type of objects to build.
  • branches/autotools-update/Clp/configure.ac

    r2314 r2334  
    7878AC_COIN_CHK_PKG(Osi,[OsiClpLib])
    7979AC_COIN_CHK_PKG(OsiTests,[OsiClpUnitTest],[osi-unittests])
    80 AC_COIN_CHK_PKG(Sample,,[coindatasample],[],[],dataonly)
    81 AC_COIN_CHK_PKG(Netlib,,[coindatanetlib],[],[],dataonly)
     80AC_COIN_CHK_PKG(Sample,,[coindatasample],[],dataonly)
     81AC_COIN_CHK_PKG(Netlib,,[coindatanetlib],[],dataonly)
    8282
    8383#############################################################################
     
    148148AC_COIN_CHK_PKG(ASL,[ClpLib],[coinasl])
    149149
    150 AC_COIN_CHECK_GNU_READLINE([ClpLib])
     150AC_COIN_CHK_GNU_READLINE([ClpLib])
    151151
    152152##############################################################################
     
    172172# Temporary hacks to shut down these two. This needs to be fixed.
    173173
    174 AM_CONDITIONAL(DEPENDENCY_LINKING,[test 0 = 1])
    175174AM_CONDITIONAL(COIN_CXX_IS_CL,[test 0 = 1])
    176175
    177176# Finalize libs and cflags.
    178177AC_COIN_FINALIZE_FLAGS([ClpLib OsiClpLib OsiClpUnitTest])
     178AC_COIN_CHK_HERE([ClpLib],[OsiClpLib],[clp])
    179179
    180180# Here list all the files that configure should create (except for the
     
    188188
    189189if test $coin_has_osi = yes ; then
    190   AC_COIN_FINALIZE_FLAGS(OsiClpLib)
    191190  AC_CONFIG_FILES([osi-clp.pc:src/OsiClp/osi-clp.pc.in])
    192191fi
  • branches/autotools-update/Clp/src/Makefile.am

    r2319 r2334  
    157157# List all additionally required libraries
    158158if DEPENDENCY_LINKING
    159 libClp_la_LIBADD = $(CLPLIB_LIBS)
    160 libClpSolver_la_LIBADD = $(CLPLIB_LIBS) libClp.la
     159libClp_la_LIBADD = $(CLPLIB_LFLAGS)
     160libClpSolver_la_LIBADD = libClp.la
    161161endif
    162162
     
    177177
    178178# List all additionally required libraries
    179 clp_LDADD = libClpSolver.la libClp.la $(CLPLIB_LIBS) $(ASL_LIBS)
     179clp_LDADD = libClpSolver.la libClp.la $(CLPLIB_LFLAGS)
    180180
    181181########################################################################
  • branches/autotools-update/Clp/src/Makefile.in

    r2319 r2334  
    284284        $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
    285285        $(CXXFLAGS) $(libClp_la_LDFLAGS) $(LDFLAGS) -o $@
    286 @DEPENDENCY_LINKING_TRUE@libClpSolver_la_DEPENDENCIES =  \
    287 @DEPENDENCY_LINKING_TRUE@       $(am__DEPENDENCIES_1) libClp.la
     286@DEPENDENCY_LINKING_TRUE@libClpSolver_la_DEPENDENCIES = libClp.la
    288287am_libClpSolver_la_OBJECTS = ClpSolver.lo CbcOrClpParam.lo Clp_ampl.lo \
    289288        MyEventHandler.lo MyMessageHandler.lo unitTest.lo
     
    413412CFLAGS = @CFLAGS@
    414413CLPLIB_CFLAGS = @CLPLIB_CFLAGS@
    415 CLPLIB_CFLAGS_PUB = @CLPLIB_CFLAGS_PUB@
    416 CLPLIB_LIBS = @CLPLIB_LIBS@
    417 CLPLIB_LIBS_PUB = @CLPLIB_LIBS_PUB@
     414CLPLIB_CFLAGS_NOPC = @CLPLIB_CFLAGS_NOPC@
     415CLPLIB_LFLAGS = @CLPLIB_LFLAGS@
     416CLPLIB_LFLAGS_NOPC = @CLPLIB_LFLAGS_NOPC@
    418417CLPLIB_PCFILES = @CLPLIB_PCFILES@
    419 CLPLIB_PCFILES_PUB = @CLPLIB_PCFILES_PUB@
    420418CLP_SVN_REV = @CLP_SVN_REV@
    421419COIN_PKG_CONFIG_PATH = @COIN_PKG_CONFIG_PATH@
     
    470468OBJEXT = @OBJEXT@
    471469OSICLPLIB_CFLAGS = @OSICLPLIB_CFLAGS@
    472 OSICLPLIB_CFLAGS_PUB = @OSICLPLIB_CFLAGS_PUB@
    473 OSICLPLIB_LIBS = @OSICLPLIB_LIBS@
    474 OSICLPLIB_LIBS_PUB = @OSICLPLIB_LIBS_PUB@
     470OSICLPLIB_CFLAGS_NOPC = @OSICLPLIB_CFLAGS_NOPC@
     471OSICLPLIB_LFLAGS = @OSICLPLIB_LFLAGS@
     472OSICLPLIB_LFLAGS_NOPC = @OSICLPLIB_LFLAGS_NOPC@
    475473OSICLPLIB_PCFILES = @OSICLPLIB_PCFILES@
    476 OSICLPLIB_PCFILES_PUB = @OSICLPLIB_PCFILES_PUB@
    477474OSICLPUNITTEST_CFLAGS = @OSICLPUNITTEST_CFLAGS@
    478 OSICLPUNITTEST_CFLAGS_PUB = @OSICLPUNITTEST_CFLAGS_PUB@
    479 OSICLPUNITTEST_LIBS = @OSICLPUNITTEST_LIBS@
    480 OSICLPUNITTEST_LIBS_PUB = @OSICLPUNITTEST_LIBS_PUB@
     475OSICLPUNITTEST_CFLAGS_NOPC = @OSICLPUNITTEST_CFLAGS_NOPC@
     476OSICLPUNITTEST_LFLAGS = @OSICLPUNITTEST_LFLAGS@
     477OSICLPUNITTEST_LFLAGS_NOPC = @OSICLPUNITTEST_LFLAGS_NOPC@
    481478OSICLPUNITTEST_PCFILES = @OSICLPUNITTEST_PCFILES@
    482 OSICLPUNITTEST_PCFILES_PUB = @OSICLPUNITTEST_PCFILES_PUB@
    483479OTOOL = @OTOOL@
    484480OTOOL64 = @OTOOL64@
     
    654650
    655651# List all additionally required libraries
    656 @DEPENDENCY_LINKING_TRUE@libClp_la_LIBADD = $(CLPLIB_LIBS)
    657 @DEPENDENCY_LINKING_TRUE@libClpSolver_la_LIBADD = $(CLPLIB_LIBS) libClp.la
     652@DEPENDENCY_LINKING_TRUE@libClp_la_LIBADD = $(CLPLIB_LFLAGS)
     653@DEPENDENCY_LINKING_TRUE@libClpSolver_la_LIBADD = libClp.la
    658654
    659655# This is for libtool
     
    665661
    666662# List all additionally required libraries
    667 clp_LDADD = libClpSolver.la libClp.la $(CLPLIB_LIBS) $(ASL_LIBS)
     663clp_LDADD = libClpSolver.la libClp.la $(CLPLIB_LFLAGS)
    668664
    669665# This line is necessary to allow VPATH compilation
  • branches/autotools-update/Clp/src/OsiClp/Makefile.in

    r2319 r2334  
    150150am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includecoindir)"
    151151LTLIBRARIES = $(lib_LTLIBRARIES)
    152 am__DEPENDENCIES_1 =
    153 @DEPENDENCY_LINKING_TRUE@libOsiClp_la_DEPENDENCIES =  \
    154 @DEPENDENCY_LINKING_TRUE@       $(am__DEPENDENCIES_1) ../libClp.la
     152@DEPENDENCY_LINKING_TRUE@libOsiClp_la_DEPENDENCIES = ../libClp.la
    155153am_libOsiClp_la_OBJECTS = OsiClpSolverInterface.lo
    156154libOsiClp_la_OBJECTS = $(am_libOsiClp_la_OBJECTS)
     
    254252CFLAGS = @CFLAGS@
    255253CLPLIB_CFLAGS = @CLPLIB_CFLAGS@
    256 CLPLIB_CFLAGS_PUB = @CLPLIB_CFLAGS_PUB@
    257 CLPLIB_LIBS = @CLPLIB_LIBS@
    258 CLPLIB_LIBS_PUB = @CLPLIB_LIBS_PUB@
     254CLPLIB_CFLAGS_NOPC = @CLPLIB_CFLAGS_NOPC@
     255CLPLIB_LFLAGS = @CLPLIB_LFLAGS@
     256CLPLIB_LFLAGS_NOPC = @CLPLIB_LFLAGS_NOPC@
    259257CLPLIB_PCFILES = @CLPLIB_PCFILES@
    260 CLPLIB_PCFILES_PUB = @CLPLIB_PCFILES_PUB@
    261258CLP_SVN_REV = @CLP_SVN_REV@
    262259COIN_PKG_CONFIG_PATH = @COIN_PKG_CONFIG_PATH@
     
    311308OBJEXT = @OBJEXT@
    312309OSICLPLIB_CFLAGS = @OSICLPLIB_CFLAGS@
    313 OSICLPLIB_CFLAGS_PUB = @OSICLPLIB_CFLAGS_PUB@
    314 OSICLPLIB_LIBS = @OSICLPLIB_LIBS@
    315 OSICLPLIB_LIBS_PUB = @OSICLPLIB_LIBS_PUB@
     310OSICLPLIB_CFLAGS_NOPC = @OSICLPLIB_CFLAGS_NOPC@
     311OSICLPLIB_LFLAGS = @OSICLPLIB_LFLAGS@
     312OSICLPLIB_LFLAGS_NOPC = @OSICLPLIB_LFLAGS_NOPC@
    316313OSICLPLIB_PCFILES = @OSICLPLIB_PCFILES@
    317 OSICLPLIB_PCFILES_PUB = @OSICLPLIB_PCFILES_PUB@
    318314OSICLPUNITTEST_CFLAGS = @OSICLPUNITTEST_CFLAGS@
    319 OSICLPUNITTEST_CFLAGS_PUB = @OSICLPUNITTEST_CFLAGS_PUB@
    320 OSICLPUNITTEST_LIBS = @OSICLPUNITTEST_LIBS@
    321 OSICLPUNITTEST_LIBS_PUB = @OSICLPUNITTEST_LIBS_PUB@
     315OSICLPUNITTEST_CFLAGS_NOPC = @OSICLPUNITTEST_CFLAGS_NOPC@
     316OSICLPUNITTEST_LFLAGS = @OSICLPUNITTEST_LFLAGS@
     317OSICLPUNITTEST_LFLAGS_NOPC = @OSICLPUNITTEST_LFLAGS_NOPC@
    322318OSICLPUNITTEST_PCFILES = @OSICLPUNITTEST_PCFILES@
    323 OSICLPUNITTEST_PCFILES_PUB = @OSICLPUNITTEST_PCFILES_PUB@
    324319OTOOL = @OTOOL@
    325320OTOOL64 = @OTOOL64@
  • branches/autotools-update/Clp/src/OsiClp/osi-clp.pc.in

    r1659 r2334  
    22exec_prefix=@exec_prefix@
    33libdir=@libdir@
    4 includedir=@includedir@/coin
     4includedir=@includedir@/coin-or
    55
    66Name: OsiClp
     
    88URL: https://projects.coin-or.org/Osi
    99Version: @PACKAGE_VERSION@
    10 Libs: -L${libdir} -lOsiClp @OSICLPLIB_PCLIBS@
    11 Cflags: -I${includedir}
    12 Requires: clp @OSICLPLIB_PCREQUIRES@
     10Libs: -L${libdir} -lOsiClp
     11Libs.private: @OSICLPLIB_LFLAGS_NOPC@
     12Cflags: -I${includedir} @OSICLPLIB_CFLAGS_NOPC@
     13Requires:
     14Requires.private: @OSICLPLIB_PCFILES@
  • branches/autotools-update/Clp/src/config.h.in

    r2310 r2334  
    2222#undef COIN_HAS_AMD
    2323
    24 /* Define to 1 if the ASL package is available */
     24/* Define to 1 if ASL is available. */
    2525#undef COIN_HAS_ASL
    2626
     
    2828#undef COIN_HAS_CHOLMOD
    2929
    30 /* Define to 1 if the CoinUtils package is available */
     30/* Define to 1 if CoinUtils is available. */
    3131#undef COIN_HAS_COINUTILS
    3232
    33 /* Define to 1 if the Glpk package is available */
     33/* Define to 1 if Glpk is available. */
    3434#undef COIN_HAS_GLPK
    3535
    36 /* Define to 1 if the Mumps package is available */
     36/* Define to 1 if Mumps is available. */
    3737#undef COIN_HAS_MUMPS
    3838
    39 /* Define to 1 if the Netlib package is available */
     39/* Define to 1 if Netlib is available. */
    4040#undef COIN_HAS_NETLIB
    4141
    42 /* Define to 1 if the Osi package is available */
     42/* Define to 1 if Osi is available. */
    4343#undef COIN_HAS_OSI
    4444
    45 /* Define to 1 if the OsiTests package is available */
     45/* Define to 1 if OsiTests is available. */
    4646#undef COIN_HAS_OSITESTS
    4747
     
    4949#undef COIN_HAS_READLINE
    5050
    51 /* Define to 1 if the Sample package is available */
     51/* Define to 1 if Sample is available. */
    5252#undef COIN_HAS_SAMPLE
    5353
  • branches/autotools-update/Clp/test/Makefile.am

    r2310 r2334  
    2222
    2323osiUnitTest_LDADD = ../src/libClp.la ../src/OsiClp/libOsiClp.la \
    24         $(CLPLIB_LIBS) $(OSICLPLIB_LIBS) $(OSICLPUNITTEST_LIBS)
     24        $(CLPLIB_LFLAGS) $(OSICLPLIB_LFLAGS) $(OSICLPUNITTEST_LFLAGS)
    2525
    2626AM_CPPFLAGS = \
  • branches/autotools-update/Clp/test/Makefile.in

    r2316 r2334  
    213213CFLAGS = @CFLAGS@
    214214CLPLIB_CFLAGS = @CLPLIB_CFLAGS@
    215 CLPLIB_CFLAGS_PUB = @CLPLIB_CFLAGS_PUB@
    216 CLPLIB_LIBS = @CLPLIB_LIBS@
    217 CLPLIB_LIBS_PUB = @CLPLIB_LIBS_PUB@
     215CLPLIB_CFLAGS_NOPC = @CLPLIB_CFLAGS_NOPC@
     216CLPLIB_LFLAGS = @CLPLIB_LFLAGS@
     217CLPLIB_LFLAGS_NOPC = @CLPLIB_LFLAGS_NOPC@
    218218CLPLIB_PCFILES = @CLPLIB_PCFILES@
    219 CLPLIB_PCFILES_PUB = @CLPLIB_PCFILES_PUB@
    220219CLP_SVN_REV = @CLP_SVN_REV@
    221220COIN_PKG_CONFIG_PATH = @COIN_PKG_CONFIG_PATH@
     
    270269OBJEXT = @OBJEXT@
    271270OSICLPLIB_CFLAGS = @OSICLPLIB_CFLAGS@
    272 OSICLPLIB_CFLAGS_PUB = @OSICLPLIB_CFLAGS_PUB@
    273 OSICLPLIB_LIBS = @OSICLPLIB_LIBS@
    274 OSICLPLIB_LIBS_PUB = @OSICLPLIB_LIBS_PUB@
     271OSICLPLIB_CFLAGS_NOPC = @OSICLPLIB_CFLAGS_NOPC@
     272OSICLPLIB_LFLAGS = @OSICLPLIB_LFLAGS@
     273OSICLPLIB_LFLAGS_NOPC = @OSICLPLIB_LFLAGS_NOPC@
    275274OSICLPLIB_PCFILES = @OSICLPLIB_PCFILES@
    276 OSICLPLIB_PCFILES_PUB = @OSICLPLIB_PCFILES_PUB@
    277275OSICLPUNITTEST_CFLAGS = @OSICLPUNITTEST_CFLAGS@
    278 OSICLPUNITTEST_CFLAGS_PUB = @OSICLPUNITTEST_CFLAGS_PUB@
    279 OSICLPUNITTEST_LIBS = @OSICLPUNITTEST_LIBS@
    280 OSICLPUNITTEST_LIBS_PUB = @OSICLPUNITTEST_LIBS_PUB@
     276OSICLPUNITTEST_CFLAGS_NOPC = @OSICLPUNITTEST_CFLAGS_NOPC@
     277OSICLPUNITTEST_LFLAGS = @OSICLPUNITTEST_LFLAGS@
     278OSICLPUNITTEST_LFLAGS_NOPC = @OSICLPUNITTEST_LFLAGS_NOPC@
    281279OSICLPUNITTEST_PCFILES = @OSICLPUNITTEST_PCFILES@
    282 OSICLPUNITTEST_PCFILES_PUB = @OSICLPUNITTEST_PCFILES_PUB@
    283280OTOOL = @OTOOL@
    284281OTOOL64 = @OTOOL64@
     
    383380@COIN_HAS_OSITESTS_TRUE@osiUnitTest_SOURCES = osiUnitTest.cpp OsiClpSolverInterfaceTest.cpp
    384381@COIN_HAS_OSITESTS_TRUE@osiUnitTest_LDADD = ../src/libClp.la ../src/OsiClp/libOsiClp.la \
    385 @COIN_HAS_OSITESTS_TRUE@        $(CLPLIB_LIBS) $(OSICLPLIB_LIBS) $(OSICLPUNITTEST_LIBS)
     382@COIN_HAS_OSITESTS_TRUE@        $(CLPLIB_LFLAGS) $(OSICLPLIB_LFLAGS) $(OSICLPUNITTEST_LFLAGS)
    386383
    387384@COIN_HAS_OSITESTS_TRUE@AM_CPPFLAGS = \
Note: See TracChangeset for help on using the changeset viewer.