]> git.notmuchmail.org Git - notmuch/commitdiff
configure: Generalize the GMime configure checks.
authorCarl Worth <cworth@cworth.org>
Wed, 21 Apr 2010 21:14:36 +0000 (14:14 -0700)
committerCarl Worth <cworth@cworth.org>
Wed, 21 Apr 2010 21:17:14 +0000 (14:17 -0700)
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.

configure

index f69cd9259c531c53efac5893ae878bfcea4cbee2..095a476e55faf256c5847a809f7d542146639a29 100755 (executable)
--- 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