From: Carl Worth <cworth@cworth.org>
Date: Wed, 21 Apr 2010 21:14:36 +0000 (-0700)
Subject: configure: Generalize the GMime configure checks.
X-Git-Tag: 0.3~133
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=cbcc3454aee63c26864428039ea688c5eb3e6be0;p=notmuch.git

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.
---

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