Merge branch '0.3.x'

[notmuch] / configure

diff --git a/configure b/configure
index 8af3dc9e24db5ec8c58758eea7ca83147a17bf5d..c522ad8524becfdb28ff73aefefbca6bb08c0411 100755 (executable)
--- a/configure
+++ b/configure
@@ -77,7 +77,9 @@ Additional options are accepted for compatibility with other
 configure-script calling conventions, but don't do anything yet:
 
        --build=<cpu>-<vendor>-<os>     Currently ignored
+       --host=<cpu>-<vendor>-<os>      Currently ignored
        --infodir=DIR                   Currently ignored
+       --datadir=DIR                   Currently ignored
        --localstatedir=DIR             Currently ignored
        --libexecdir=DIR                Currently ignored
        --disable-maintainer-mode       Currently ignored
@@ -119,8 +121,26 @@ for option; do
        build_option=${build_option#*-}
        build_vendor=${build_option%%-*}
        build_os=${build_option#*-}
+    elif [ "${option%%=*}" = '--host' ] ; then
+       host_option="${option#*=}"
+       case ${host_option} in
+           *-*-*) ;;
+           *)
+               echo "Unrecognized value for --host option: ${host_option}"
+               echo "Should be: <cpu>-<vendor>-<os>"
+               echo "See:"
+               echo "  $0 --help"
+               echo ""
+               exit 1
+       esac
+       host_cpu=${host_option%%-*}
+       host_option=${host_option#*-}
+       host_vendor=${host_option%%-*}
+       host_os=${host_option#*-}
     elif [ "${option%%=*}" = '--infodir' ] ; then
        true
+    elif [ "${option%%=*}" = '--datadir' ] ; then
+       true
     elif [ "${option%%=*}" = '--localstatedir' ] ; then
        true
     elif [ "${option%%=*}" = '--libexecdir' ] ; then
@@ -170,7 +190,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 +202,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 +261,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 +437,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}