mirror of
https://git.notmuchmail.org/git/notmuch
synced 2024-12-22 09:24:54 +01:00
configure: Use pkg-config --exists rather than --modversion
With --modversion we were asking for output that we were just throwing away anyway. The --exists option does just what we want, (no output and communivating only via return value). Also, --exists allows for testing versions of the package as well.
This commit is contained in:
parent
7278383005
commit
8df28ec509
1 changed files with 4 additions and 4 deletions
8
configure
vendored
8
configure
vendored
|
@ -220,7 +220,7 @@ fi
|
||||||
printf "Checking for GMime development files... "
|
printf "Checking for GMime development files... "
|
||||||
have_gmime=0
|
have_gmime=0
|
||||||
for gmimepc in gmime-2.6 gmime-2.4; do
|
for gmimepc in gmime-2.6 gmime-2.4; do
|
||||||
if pkg-config --modversion $gmimepc > /dev/null 2>&1; then
|
if pkg-config --exists $gmimepc; then
|
||||||
printf "Yes ($gmimepc).\n"
|
printf "Yes ($gmimepc).\n"
|
||||||
have_gmime=1
|
have_gmime=1
|
||||||
gmime_cflags=$(pkg-config --cflags $gmimepc)
|
gmime_cflags=$(pkg-config --cflags $gmimepc)
|
||||||
|
@ -233,7 +233,7 @@ if [ "$have_gmime" = "0" ]; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
printf "Checking for talloc development files... "
|
printf "Checking for talloc development files... "
|
||||||
if pkg-config --modversion talloc > /dev/null 2>&1; then
|
if pkg-config --exists talloc; then
|
||||||
printf "Yes.\n"
|
printf "Yes.\n"
|
||||||
have_talloc=1
|
have_talloc=1
|
||||||
talloc_cflags=$(pkg-config --cflags talloc)
|
talloc_cflags=$(pkg-config --cflags talloc)
|
||||||
|
@ -246,7 +246,7 @@ else
|
||||||
fi
|
fi
|
||||||
|
|
||||||
printf "Checking for valgrind development files... "
|
printf "Checking for valgrind development files... "
|
||||||
if pkg-config --modversion valgrind > /dev/null 2>&1; then
|
if pkg-config --exists valgrind; then
|
||||||
printf "Yes.\n"
|
printf "Yes.\n"
|
||||||
have_valgrind=1
|
have_valgrind=1
|
||||||
valgrind_cflags=$(pkg-config --cflags valgrind)
|
valgrind_cflags=$(pkg-config --cflags valgrind)
|
||||||
|
@ -256,7 +256,7 @@ else
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -z "${EMACSLISPDIR}" ]; then
|
if [ -z "${EMACSLISPDIR}" ]; then
|
||||||
if pkg-config --modversion emacs > /dev/null 2>&1; then
|
if pkg-config --exists emacs; then
|
||||||
EMACSLISPDIR=$(pkg-config emacs --variable sitepkglispdir)
|
EMACSLISPDIR=$(pkg-config emacs --variable sitepkglispdir)
|
||||||
else
|
else
|
||||||
EMACSLISPDIR='$(prefix)/share/emacs/site-lisp'
|
EMACSLISPDIR='$(prefix)/share/emacs/site-lisp'
|
||||||
|
|
Loading…
Reference in a new issue