mirror of
https://git.notmuchmail.org/git/notmuch
synced 2024-12-22 17:34:54 +01:00
configure: Generalize the GMime configure checks.
This way when GMime 2.8 comes out we can simply add it to the list rather than adding an additional block of conditional code for it. Also GMime 2.6 is now preferred over GMime 2.4.
This commit is contained in:
parent
65b634145a
commit
cbcc3454ae
1 changed files with 11 additions and 13 deletions
24
configure
vendored
24
configure
vendored
|
@ -182,20 +182,18 @@ if [ ${have_xapian} = "0" ]; then
|
||||||
errors=$((errors + 1))
|
errors=$((errors + 1))
|
||||||
fi
|
fi
|
||||||
|
|
||||||
printf "Checking for GMime 2.4 development files... "
|
printf "Checking for GMime development files... "
|
||||||
if pkg-config --modversion gmime-2.4 > /dev/null 2>&1; then
|
have_gmime=0
|
||||||
printf "Yes.\n"
|
for gmimepc in gmime-2.6 gmime-2.4; do
|
||||||
have_gmime=1
|
if pkg-config --modversion $gmimepc > /dev/null 2>&1; then
|
||||||
gmime_cflags=$(pkg-config --cflags gmime-2.4)
|
printf "Yes ($gmimepc).\n"
|
||||||
gmime_ldflags=$(pkg-config --libs gmime-2.4)
|
have_gmime=1
|
||||||
elif pkg-config --modversion gmime-2.6 > /dev/null 2>&1; then
|
gmime_cflags=$(pkg-config --cflags $gmimepc)
|
||||||
printf "Yes.\n"
|
gmime_ldflags=$(pkg-config --libs $gmimepc)
|
||||||
have_gmime=1
|
fi
|
||||||
gmime_cflags=$(pkg-config --cflags gmime-2.6)
|
done
|
||||||
gmime_ldflags=$(pkg-config --libs gmime-2.6)
|
if [ "$have_gmime" = "0" ]; then
|
||||||
else
|
|
||||||
printf "No.\n"
|
printf "No.\n"
|
||||||
have_gmime=0
|
|
||||||
errors=$((errors + 1))
|
errors=$((errors + 1))
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue