X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=configure;h=c5e2ffed9e6705a9b16f5cf52f3c57235bc40044;hp=ed7c22800530669ca88ef9ab5d6b7c4d71b7de0c;hb=6ac3d8c27f8edc8b3b84440900771053d6efd9dd;hpb=523d2b50fcaae90cbe09975c1f1bc652ff521ec6 diff --git a/configure b/configure index ed7c2280..c5e2ffed 100755 --- a/configure +++ b/configure @@ -484,11 +484,18 @@ fi GMIME_MINVER=2.6.7 printf "Checking for GMime development files... " -if pkg-config --exists "gmime-2.6 >= $GMIME_MINVER"; then - printf "Yes.\n" +if pkg-config --exists "gmime-3.0"; then + printf "Yes (3.0).\n" + have_gmime=1 + gmime_cflags=$(pkg-config --cflags gmime-3.0) + gmime_ldflags=$(pkg-config --libs gmime-3.0) + gmime_major=3 +elif pkg-config --exists "gmime-2.6 >= $GMIME_MINVER"; then + printf "Yes (2.6).\n" have_gmime=1 gmime_cflags=$(pkg-config --cflags gmime-2.6) gmime_ldflags=$(pkg-config --libs gmime-2.6) + gmime_major=2 else have_gmime=0 printf "No.\n" @@ -1207,6 +1214,9 @@ NOTMUCH_PYTHON=${python} # building/testing ruby bindings. NOTMUCH_HAVE_RUBY_DEV=${have_ruby_dev} +# Major version of gmime +NOTMUCH_GMIME_MAJOR=${gmime_major} + # Platform we are run on PLATFORM=${platform} EOF