X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=configure;h=7f5ca7d1936243439e253d15029f4ffbc56ff3c5;hp=21780a6149a1a2b33fc5bdced5f57798ae827524;hb=b825204f0df565d06d47f2323b438bac110a8c76;hpb=dfbec15b2388158693ab0dce0c7d348c4c5a98a5

diff --git a/configure b/configure
index 21780a61..7f5ca7d1 100755
--- a/configure
+++ b/configure
@@ -71,7 +71,7 @@ Fine tuning of some installation directories is available:
 	--includedir=DIR	Install header files to DIR [PREFIX/include]
 	--mandir=DIR		Install man pages to DIR [PREFIX/share/man]
 	--sysconfdir=DIR	Read-only single-machine data [PREFIX/etc]
-	--emacslispdir=DIR	Elisp [PREFIX/share/emacs/site-lisp/notmuch]
+	--emacslispdir=DIR	Emacs code [PREFIX/share/emacs/site-lisp]
 
 Additional options are accepted for compatibility with other
 configure-script calling conventions, but don't do anything yet:
@@ -219,9 +219,9 @@ fi
 
 if [ -z "${EMACSLISPDIR}" ]; then
     if pkg-config --modversion emacs > /dev/null 2>&1; then
-	EMACSLISPDIR=$(pkg-config emacs --variable sitepkglispdir)/notmuch
+	EMACSLISPDIR=$(pkg-config emacs --variable sitepkglispdir)
     else
-	EMACSLISPDIR='$(prefix)/share/emacs/site-lisp/notmuch'
+	EMACSLISPDIR='$(prefix)/share/emacs/site-lisp'
     fi
 fi
 
@@ -234,6 +234,17 @@ else
     have_emacs=0
 fi
 
+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
     cat <<EOF
 
@@ -310,6 +321,17 @@ else
 fi
 rm -f compat/have_getline
 
+printf "Checking for strcasestr... "
+if ${CC} -o compat/have_strcasestr compat/have_strcasestr.c > /dev/null 2>&1
+then
+    printf "Yes.\n"
+    have_strcasestr=1
+else
+    printf "No (will use our own instead).\n"
+    have_strcasestr=0
+fi
+rm -f compat/have_strcasestr
+
 cat <<EOF
 
 All required packages were found. You may now run the following
@@ -357,7 +379,7 @@ prefix = ${PREFIX}
 libdir = ${LIBDIR:=\$(prefix)/lib}
 
 # The directory to which header files should be installed
-includedir = ${INCLUDEDIR:=\$(prefix)/lib}
+includedir = ${INCLUDEDIR:=\$(prefix)/include}
 
 # The directory to which man pages should be installed
 mandir = ${MANDIR:=\$(prefix)/share/man}
@@ -384,6 +406,19 @@ zsh_completion_dir = \$(prefix)/share/zsh/functions/Completion/Unix
 # build its own version)
 HAVE_GETLINE = ${have_getline}
 
+# Whether the strcasestr function is available (if not, then notmuch will
+# build its own version)
+HAVE_STRCASESTR = ${have_strcasestr}
+
+# Whether we are building on OS X.  This will affect how we build the
+# 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}
@@ -405,9 +440,10 @@ VALGRIND_CFLAGS = ${valgrind_cflags}
 # Combined flags for compiling and linking against all of the above
 CONFIGURE_CFLAGS = -DHAVE_GETLINE=\$(HAVE_GETLINE) \$(GMIME_CFLAGS)      \\
 		   \$(TALLOC_CFLAGS) -DHAVE_VALGRIND=\$(HAVE_VALGRIND)   \\
-		   \$(VALGRIND_CFLAGS)
+		   \$(VALGRIND_CFLAGS) -DHAVE_STRCASESTR=\$(HAVE_STRCASESTR)
 CONFIGURE_CXXFLAGS = -DHAVE_GETLINE=\$(HAVE_GETLINE) \$(GMIME_CFLAGS)    \\
 		     \$(TALLOC_CFLAGS) -DHAVE_VALGRIND=\$(HAVE_VALGRIND) \\
-		     \$(VALGRIND_CFLAGS) \$(XAPIAN_CXXFLAGS)
+		     \$(VALGRIND_CFLAGS) \$(XAPIAN_CXXFLAGS)             \\
+                     -DHAVE_STRCASESTR=\$(HAVE_STRCASESTR)
 CONFIGURE_LDFLAGS =  \$(GMIME_LDFLAGS) \$(TALLOC_LDFLAGS) \$(XAPIAN_LDFLAGS)
 EOF