Mercurial > mxe-octave
changeset 4977:2bffe6abd696
Detect build pkg-config path in configure
* Makefile.in: set BUILD_PKG_CONFIG_PATH from configure values
* configure.ac: detect pkg-config path from pkg-config variable
| author | John Donoghue |
|---|---|
| date | Wed, 27 Feb 2019 08:48:15 -0500 |
| parents | 443463cb9e4a |
| children | 7eb5d67a54e3 |
| files | Makefile.in configure.ac |
| diffstat | 2 files changed, 23 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile.in Tue Feb 26 14:12:38 2019 -0500 +++ b/Makefile.in Wed Feb 27 08:48:15 2019 -0500 @@ -316,18 +316,7 @@ ENV_PKG_CONFIG_PATH := $(PKG_CONFIG_PATH) -ifeq ($(BUILD_PKG_CONFIG_PATH),) - ifeq ($(PKG_CONFIG_PATH),) - BUILD_PKG_CONFIG_PATH := $(PKG_CONFIG_PATH) - else - ifneq (,$(wildcard /usr/lib/$(subst -pc,,$(BUILD_SYSTEM)))) - BUILD_PKG_CONFIG_PATH := /usr/lib/$(subst -pc,,$(BUILD_SYSTEM))/pkgconfig - else - BUILD_PKG_CONFIG_PATH := /usr/lib/pkgconfig - endif - endif - export BUILD_PKG_CONFIG_PATH -endif +BUILD_PKG_CONFIG_PATH ?= @BUILD_PKG_CONFIG_PATH@ CONFIGURE_CPPFLAGS := CPPFLAGS='-I$(HOST_PREFIX)/include' ifeq ($(MXE_USE_LIB64_DIRECTORY),yes)
--- a/configure.ac Tue Feb 26 14:12:38 2019 -0500 +++ b/configure.ac Wed Feb 27 08:48:15 2019 -0500 @@ -99,6 +99,28 @@ esac], [USE_MSYS2=yes]) AC_SUBST(USE_MSYS2) +# try find pkg-config build paths +BUILD_PKG_CONFIG_PATH=auto +AC_ARG_WITH([build-pkg-config-path], + [AS_HELP_STRING([--with-build-pkg-config-path=PATH], + [use PATH as the build pkg-config path (default: auto)])], + [BUILD_PKG_CONFIG_PATH=$withval], + [BUILD_PKG_CONFIG_PATH=auto]) + +if test "x$BUILD_PKG_CONFIG_PATH" = "xauto"; then + PKG_CHECK_VAR([BUILDPKGCONFIGPATH], [pkg-config], [pc_path]) + AC_MSG_CHECKING([for build pkg-config paths]) + if test "x$BUILDPKGCONFIGPATH" = "x"; then + AC_MSG_RESULT([couldnt auto detect pkg-config paths"]) + BUILD_PKG_CONFIG_PATH="" + else + BUILD_PKG_CONFIG_PATH="$BUILDPKGCONFIGPATH" + AC_MSG_RESULT([$BUILD_PKG_CONFIG_PATH]) + fi +fi +AC_SUBST(BUILD_PKG_CONFIG_PATH) + + AC_ARG_ENABLE([windows-64], [AS_HELP_STRING([--disable-windows-64], [don't build a Windows 64 cross compiler])],