X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=configure;h=095a476e55faf256c5847a809f7d542146639a29;hp=f69cd9259c531c53efac5893ae878bfcea4cbee2;hb=cbcc3454aee63c26864428039ea688c5eb3e6be0;hpb=65b634145a1a114f63b284337de4f0c0f57924a9 diff --git a/configure b/configure index f69cd925..095a476e 100755 --- a/configure +++ b/configure @@ -182,20 +182,18 @@ if [ ${have_xapian} = "0" ]; then errors=$((errors + 1)) fi -printf "Checking for GMime 2.4 development files... " -if pkg-config --modversion gmime-2.4 > /dev/null 2>&1; then - printf "Yes.\n" - have_gmime=1 - gmime_cflags=$(pkg-config --cflags gmime-2.4) - gmime_ldflags=$(pkg-config --libs gmime-2.4) -elif pkg-config --modversion gmime-2.6 > /dev/null 2>&1; then - printf "Yes.\n" - have_gmime=1 - gmime_cflags=$(pkg-config --cflags gmime-2.6) - gmime_ldflags=$(pkg-config --libs gmime-2.6) -else +printf "Checking for GMime development files... " +have_gmime=0 +for gmimepc in gmime-2.6 gmime-2.4; do + if pkg-config --modversion $gmimepc > /dev/null 2>&1; then + printf "Yes ($gmimepc).\n" + have_gmime=1 + gmime_cflags=$(pkg-config --cflags $gmimepc) + gmime_ldflags=$(pkg-config --libs $gmimepc) + fi +done +if [ "$have_gmime" = "0" ]; then printf "No.\n" - have_gmime=0 errors=$((errors + 1)) fi