40 lines
1.7 KiB
Text
40 lines
1.7 KiB
Text
$NetBSD: patch-Clp-configure,v 1.1 2016/04/12 22:04:30 wiz Exp $
|
|
|
|
Fix build with pkgconf.
|
|
|
|
--- Clp/configure.orig 2015-09-21 18:52:13.000000000 +0000
|
|
+++ Clp/configure
|
|
@@ -20682,33 +20682,6 @@ fi
|
|
|
|
|
|
|
|
-# assemble pkg-config search path for installed projects
|
|
-COIN_PKG_CONFIG_PATH="$PKG_CONFIG_PATH"
|
|
-
|
|
-# let's assume that when installing into $prefix, then the user may have installed some other coin projects there before, so it's worth to have a look into there
|
|
-# best would actually to use ${libdir}, since .pc files get installed into ${libdir}/pkgconfig,
|
|
-# unfortunately, ${libdir} expands to ${exec_prefix}/lib and ${exec_prefix} to ${prefix}...
|
|
-if test "x${prefix}" = xNONE ; then
|
|
- COIN_PKG_CONFIG_PATH="${ac_default_prefix}/lib64/pkgconfig:${ac_default_prefix}/lib/pkgconfig:${ac_default_prefix}/share/pkgconfig:${COIN_PKG_CONFIG_PATH}"
|
|
-else
|
|
- COIN_PKG_CONFIG_PATH="${prefix}/lib64/pkgconfig:${prefix}/lib/pkgconfig:${prefix}/share/pkgconfig:${COIN_PKG_CONFIG_PATH}"
|
|
-fi
|
|
-
|
|
-
|
|
-# Check whether --with-coin-instdir or --without-coin-instdir was given.
|
|
-if test "${with_coin_instdir+set}" = set; then
|
|
- withval="$with_coin_instdir"
|
|
- if test -d "$withval"; then : ; else
|
|
- { { echo "$as_me:$LINENO: error: argument for --with-coin-instdir not a directory" >&5
|
|
-echo "$as_me: error: argument for --with-coin-instdir not a directory" >&2;}
|
|
- { (exit 1); exit 1; }; }
|
|
- fi
|
|
- COIN_PKG_CONFIG_PATH="$withval/lib/pkgconfig:$withval/share/pkgconfig:${COIN_PKG_CONFIG_PATH}"
|
|
-
|
|
-fi;
|
|
-
|
|
-
|
|
-
|
|
# assemble additional pkg-config search paths for uninstalled projects
|
|
if test x$coin_projectdir = xyes ; then
|
|
# if we are in a project setup, then in a classic setup, we want to find uninstalled projects
|