Changeset 1683 for trunk/Clp


Ignore:
Timestamp:
Feb 14, 2011 12:22:20 PM (9 years ago)
Author:
stefan
Message:

rerun autotools

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/Clp/configure

    r1675 r1683  
    2063420634  fi
    2063520635  if test -n "$PKG_CONFIG"; then
    20636     _pkg_min_version=0.9.0
     20636    _pkg_min_version=0.16.0
    2063720637    echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
    2063820638echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6
     
    2067520675# unfortunately, ${libdir} expands to ${exec_prefix}/lib and ${exec_prefix} to ${prefix}...
    2067620676if test "x${prefix}" = xNONE ; then
    20677   COIN_PKG_CONFIG_PATH="${ac_default_prefix}/lib/pkgconfig:${COIN_PKG_CONFIG_PATH}"
    20678 else
    20679   COIN_PKG_CONFIG_PATH="${prefix}/lib/pkgconfig:${COIN_PKG_CONFIG_PATH}"
     20677  COIN_PKG_CONFIG_PATH="${ac_default_prefix}/lib/pkgconfig:${ac_default_prefix}/share/pkgconfig:${COIN_PKG_CONFIG_PATH}"
     20678else
     20679  COIN_PKG_CONFIG_PATH="${prefix}/lib/pkgconfig:${prefix}/share/pkgconfig:${COIN_PKG_CONFIG_PATH}"
    2068020680fi
    2068120681
     
    2068920689   { (exit 1); exit 1; }; }
    2069020690   fi
    20691    COIN_PKG_CONFIG_PATH="$withval/lib/pkgconfig:${COIN_PKG_CONFIG_PATH}"
     20691   COIN_PKG_CONFIG_PATH="$withval/lib/pkgconfig:$withval/share/pkgconfig:${COIN_PKG_CONFIG_PATH}"
    2069220692
    2069320693fi;
     
    2072720727fi
    2072820728
     20729if test -n "$PKG_CONFIG" && test x$coin_cc_is_cl = xtrue; then
     20730  { echo "$as_me:$LINENO: WARNING: Using pkg-config together with MS or Intel Compiler on Windows is not support by example Makefiles. Consider using --disable-pkg-config." >&5
     20731echo "$as_me: WARNING: Using pkg-config together with MS or Intel Compiler on Windows is not support by example Makefiles. Consider using --disable-pkg-config." >&2;}
     20732fi
     20733
    2072920734
    2073020735
     
    2077820783         CLPLIB_LIBS="$withval $CLPLIB_LIBS"
    2077920784
     20785       # if project flags are given by user and we build without pkg-config, then we need to setup the _INSTALLED variables
     20786       if test -z "$PKG_CONFIG" ; then
     20787         COINUTILS_LIBS_INSTALLED="$withval"
     20788         CLPLIB_LIBS_INSTALLED="$withval $CLPLIB_LIBS_INSTALLED"
     20789       fi
    2078020790     fi
    2078120791
     
    2079320803       coin_has_coinutils=yes
    2079420804       COINUTILS_CFLAGS="-I`${CYGPATH_W} $withval`"
    20795        CLPLIB_CFLAGS="$withval $CLPLIB_CFLAGS"
     20805       CLPLIB_CFLAGS="-I`${CYGPATH_W} $withval` $CLPLIB_CFLAGS"
     20806       # if project flags are given by user and we build without pkg-config, then we need to setup the _INSTALLED variables
     20807       if test -z "$PKG_CONFIG" ; then
     20808         COINUTILS_CFLAGS_INSTALLED="$COINUTILS_CFLAGS"
     20809         CLPLIB_CFLAGS_INSTALLED="$COINUTILS_CFLAGS $CLPLIB_CFLAGS_INSTALLED"
     20810       fi
    2079620811     fi
    2079720812
     
    2080920824       coin_has_coinutils=yes
    2081020825       COINUTILS_DATA="$withval"
     20826       # if project flags are given by user and we build without pkg-config, then we need to setup the _INSTALLED variables
     20827       if test -z "$PKG_CONFIG" ; then
     20828         COINUTILS_DATA_INSTALLED="$withval"
     20829       fi
    2081120830     fi
    2081220831
     
    2124921268         OSICLPLIB_LIBS="$withval $OSICLPLIB_LIBS"
    2125021269
     21270       # if project flags are given by user and we build without pkg-config, then we need to setup the _INSTALLED variables
     21271       if test -z "$PKG_CONFIG" ; then
     21272         OSI_LIBS_INSTALLED="$withval"
     21273         OSICLPLIB_LIBS_INSTALLED="$withval $OSICLPLIB_LIBS_INSTALLED"
     21274       fi
    2125121275     fi
    2125221276
     
    2126421288       coin_has_osi=yes
    2126521289       OSI_CFLAGS="-I`${CYGPATH_W} $withval`"
    21266        OSICLPLIB_CFLAGS="$withval $OSICLPLIB_CFLAGS"
     21290       OSICLPLIB_CFLAGS="-I`${CYGPATH_W} $withval` $OSICLPLIB_CFLAGS"
     21291       # if project flags are given by user and we build without pkg-config, then we need to setup the _INSTALLED variables
     21292       if test -z "$PKG_CONFIG" ; then
     21293         OSI_CFLAGS_INSTALLED="$OSI_CFLAGS"
     21294         OSICLPLIB_CFLAGS_INSTALLED="$OSI_CFLAGS $OSICLPLIB_CFLAGS_INSTALLED"
     21295       fi
    2126721296     fi
    2126821297
     
    2128021309       coin_has_osi=yes
    2128121310       OSI_DATA="$withval"
     21311       # if project flags are given by user and we build without pkg-config, then we need to setup the _INSTALLED variables
     21312       if test -z "$PKG_CONFIG" ; then
     21313         OSI_DATA_INSTALLED="$withval"
     21314       fi
    2128221315     fi
    2128321316
     
    2170421737       OSITESTS_LIBS="$withval"
    2170521738
     21739       # if project flags are given by user and we build without pkg-config, then we need to setup the _INSTALLED variables
     21740       if test -z "$PKG_CONFIG" ; then
     21741         OSITESTS_LIBS_INSTALLED="$withval"
     21742
     21743       fi
    2170621744     fi
    2170721745
     
    2172021758       OSITESTS_CFLAGS="-I`${CYGPATH_W} $withval`"
    2172121759
     21760       # if project flags are given by user and we build without pkg-config, then we need to setup the _INSTALLED variables
     21761       if test -z "$PKG_CONFIG" ; then
     21762         OSITESTS_CFLAGS_INSTALLED="$OSITESTS_CFLAGS"
     21763
     21764       fi
    2172221765     fi
    2172321766
     
    2173521778       coin_has_ositests=yes
    2173621779       OSITESTS_DATA="$withval"
     21780       # if project flags are given by user and we build without pkg-config, then we need to setup the _INSTALLED variables
     21781       if test -z "$PKG_CONFIG" ; then
     21782         OSITESTS_DATA_INSTALLED="$withval"
     21783       fi
    2173721784     fi
    2173821785
     
    2214022187       SAMPLE_LIBS="$withval"
    2214122188
     22189       # if project flags are given by user and we build without pkg-config, then we need to setup the _INSTALLED variables
     22190       if test -z "$PKG_CONFIG" ; then
     22191         SAMPLE_LIBS_INSTALLED="$withval"
     22192
     22193       fi
    2214222194     fi
    2214322195
     
    2215622208       SAMPLE_CFLAGS="-I`${CYGPATH_W} $withval`"
    2215722209
     22210       # if project flags are given by user and we build without pkg-config, then we need to setup the _INSTALLED variables
     22211       if test -z "$PKG_CONFIG" ; then
     22212         SAMPLE_CFLAGS_INSTALLED="$SAMPLE_CFLAGS"
     22213
     22214       fi
    2215822215     fi
    2215922216
     
    2217122228       coin_has_sample=yes
    2217222229       SAMPLE_DATA="$withval"
     22230       # if project flags are given by user and we build without pkg-config, then we need to setup the _INSTALLED variables
     22231       if test -z "$PKG_CONFIG" ; then
     22232         SAMPLE_DATA_INSTALLED="$withval"
     22233       fi
    2217322234     fi
    2217422235
     
    2257622637       NETLIB_LIBS="$withval"
    2257722638
     22639       # if project flags are given by user and we build without pkg-config, then we need to setup the _INSTALLED variables
     22640       if test -z "$PKG_CONFIG" ; then
     22641         NETLIB_LIBS_INSTALLED="$withval"
     22642
     22643       fi
    2257822644     fi
    2257922645
     
    2259222658       NETLIB_CFLAGS="-I`${CYGPATH_W} $withval`"
    2259322659
     22660       # if project flags are given by user and we build without pkg-config, then we need to setup the _INSTALLED variables
     22661       if test -z "$PKG_CONFIG" ; then
     22662         NETLIB_CFLAGS_INSTALLED="$NETLIB_CFLAGS"
     22663
     22664       fi
    2259422665     fi
    2259522666
     
    2260722678       coin_has_netlib=yes
    2260822679       NETLIB_DATA="$withval"
     22680       # if project flags are given by user and we build without pkg-config, then we need to setup the _INSTALLED variables
     22681       if test -z "$PKG_CONFIG" ; then
     22682         NETLIB_DATA_INSTALLED="$withval"
     22683       fi
    2260922684     fi
    2261022685
Note: See TracChangeset for help on using the changeset viewer.