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

diff --git a/configure b/configure
index 8af3dc9e..ec8c3fd3 100755
--- a/configure
+++ b/configure
@@ -170,7 +170,7 @@ printf "Checking for Xapian development files... "
 have_xapian=0
 for xapian_config in ${XAPIAN_CONFIG}; do
     if ${xapian_config} --version > /dev/null 2>&1; then
-	printf "Yes.\n"
+	printf "Yes (%s).\n" $(${xapian_config} --version | sed -e 's/.* //')
 	have_xapian=1
 	xapian_cxxflags=$(${xapian_config} --cxxflags)
 	xapian_ldflags=$(${xapian_config} --libs)
@@ -182,15 +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)
-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
 
@@ -238,9 +241,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 +417,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}