]> git.notmuchmail.org Git - notmuch/commitdiff
configure: add optional support for gmime-3.0
authorDavid Bremner <david@tethera.net>
Sat, 27 May 2017 16:51:17 +0000 (13:51 -0300)
committerDavid Bremner <david@tethera.net>
Thu, 1 Jun 2017 00:52:15 +0000 (21:52 -0300)
This is only the changes to make configure work; it won't compile with
gmime-3.0 yet.

configure

index ed7c22800530669ca88ef9ab5d6b7c4d71b7de0c..91aeba512e2279c67b063dec611a748b0e63eb28 100755 (executable)
--- a/configure
+++ b/configure
@@ -484,8 +484,13 @@ fi
 GMIME_MINVER=2.6.7
 
 printf "Checking for GMime development files... "
 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)
+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)
     have_gmime=1
     gmime_cflags=$(pkg-config --cflags gmime-2.6)
     gmime_ldflags=$(pkg-config --libs gmime-2.6)