kolan
/
gkrellm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use same cc/pkg-config in make and configure 

- Export the CC and PKG_CONFIG variables before calling configure scripts,
especially for cross compilation and modified environments, otherwise
configure might detect libraries that are not usable by the compiler
later on

- Replace the hardcoded pkg-config calls in configure with a variable
  that may be overridden by Makefile
This commit is contained in:
Stefan Gehn 2014-08-23 18:34:32 +02:00
parent c02a7d57e6
commit 1ffcfaca72
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common.mk
View File

@ -13,6 +13,10 @@ else
WINDRES ?= windres WINDRES ?= windres
endif endif
# Make configure use identical environment
export CC
export PKG_CONFIG
PREFIX ?= /usr/local PREFIX ?= /usr/local
INSTALLROOT ?= $(DESTDIR)$(PREFIX) INSTALLROOT ?= $(DESTDIR)$(PREFIX)

16
src/configure vendored
View File

@ -33,9 +33,11 @@ touch configure.mk
exec 5>./configure.log exec 5>./configure.log
CC=${CC-gcc} CC=${CC-gcc}
PKG_CONFIG=${PKG_CONFIG-pkg-config}
echo "CC : ${CC}" 1>& 5 echo "CC : ${CC}" 1>& 5
echo "CFLAGS: ${CFLAGS}" 1>& 5 echo "CFLAGS: ${CFLAGS}" 1>& 5
echo "PKG_CONFIG: ${PKG_CONFIG}" 1>& 5
rm -f test test.exe test.o test.c rm -f test test.exe test.o test.c
@ -44,8 +46,8 @@ then
echo -n "Checking for OpenSSL... " echo -n "Checking for OpenSSL... "
echo "Checking for OpenSSL... " 1>& 5 echo "Checking for OpenSSL... " 1>& 5
OPENSSL_INCLUDE="$(pkg-config openssl --cflags 2>& 5 || true)" OPENSSL_INCLUDE="$(${PKG_CONFIG} openssl --cflags 2>& 5 || true)"
OPENSSL_LIBS="$(pkg-config openssl --libs 2>& 5 || true)" OPENSSL_LIBS="$(${PKG_CONFIG} openssl --libs 2>& 5 || true)"
if [ -z "$OPENSSL_LIBS" ] if [ -z "$OPENSSL_LIBS" ]
then then
echo "OpenSSL not found via pkg-config, using hardcoded library names" 1>& 5 echo "OpenSSL not found via pkg-config, using hardcoded library names" 1>& 5
@ -93,12 +95,12 @@ then
echo -n "Checking for gnutls... " echo -n "Checking for gnutls... "
echo "Checking for gnutls... " 1>& 5 echo "Checking for gnutls... " 1>& 5
GNUTLS_INCLUDE="$(pkg-config gnutls --cflags 2>& 5 || true)" GNUTLS_INCLUDE="$(${PKG_CONFIG} gnutls --cflags 2>& 5 || true)"
GNUTLS_LIBS="$(pkg-config gnutls --libs 2>& 5 || true) -lgnutls-openssl" GNUTLS_LIBS="$(${PKG_CONFIG} gnutls --libs 2>& 5 || true) -lgnutls-openssl"
# GnuTLS >= 2.12 does not need explicit gcrypt linking anymore # GnuTLS >= 2.12 does not need explicit gcrypt linking anymore
gcrypt_h="" gcrypt_h=""
if $(pkg-config --max-version=2.11.99 gnutls 2>& 5 || false); then if $(${PKG_CONFIG} --max-version=2.11.99 gnutls 2>& 5 || false); then
GNUTLS_LIBS="$GNUTLS_LIBS -lgcrypt" GNUTLS_LIBS="$GNUTLS_LIBS -lgcrypt"
gcrypt_h="#include <gcrypt.h>" gcrypt_h="#include <gcrypt.h>"
fi fi
@ -149,8 +151,8 @@ then
echo -n "Checking for libntlm... " echo -n "Checking for libntlm... "
echo "Checking for libntlm... " 1>& 5 echo "Checking for libntlm... " 1>& 5
PKG_NTLM_INCLUDE=$(pkg-config libntlm --cflags 2>& 5 || true) PKG_NTLM_INCLUDE=$(${PKG_CONFIG} libntlm --cflags 2>& 5 || true)
PKG_NTLM_LIBS=$(pkg-config libntlm --libs 2>& 5 || true) PKG_NTLM_LIBS=$(${PKG_CONFIG} libntlm --libs 2>& 5 || true)
cat << EOF > test.c cat << EOF > test.c
#include <ntlm.h> #include <ntlm.h>