X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=configure;h=f69cd9259c531c53efac5893ae878bfcea4cbee2;hp=8af3dc9e24db5ec8c58758eea7ca83147a17bf5d;hb=65b634145a1a114f63b284337de4f0c0f57924a9;hpb=8c8079a8b14fac5e8ca6b682e5c76e08a824f2e7

diff --git a/configure b/configure
index 8af3dc9e..f69cd925 100755
--- a/configure
+++ b/configure
@@ -188,6 +188,11 @@ if pkg-config --modversion gmime-2.4 > /dev/null 2>&1; then
     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 "No.\n"
     have_gmime=0
@@ -238,9 +243,11 @@ printf "Checking for Mac OS X (for shared library)... "
 if [ `uname` = "Darwin" ] ; then
     printf "Yes.\n"
     mac_os_x=1
+    linker_resolves_library_dependencies=0
 else
     printf "No.\n"
     mac_os_x=0
+    linker_resolves_library_dependencies=1
 fi
 
 if [ $errors -gt 0 ]; then
@@ -412,6 +419,11 @@ HAVE_STRCASESTR = ${have_strcasestr}
 # shared library.
 MAC_OS_X = ${mac_os_x}
 
+# Whether the linker will automatically resolve the dependency of one
+# library on another (if not, then linking a binary requires linking
+# directly against both)
+LINKER_RESOLVES_LIBRARY_DEPENDENCIES = ${linker_resolves_library_dependencies}
+
 # Flags needed to compile and link against Xapian
 XAPIAN_CXXFLAGS = ${xapian_cxxflags}
 XAPIAN_LDFLAGS = ${xapian_ldflags}