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

diff --git a/configure b/configure
index ba205764..f69cd925 100755
--- a/configure
+++ b/configure
@@ -67,7 +67,21 @@ specify an installation prefix other than $PREFIX using
 
 Fine tuning of some installation directories is available:
 
-	--libdir=DIR	Install libraries in LIBDIR [PREFIX/lib]
+	--libdir=DIR		Install libraries to DIR [PREFIX/lib]
+	--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	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:
+
+	--build=<cpu>-<vendor>-<os>	Currently ignored
+	--infodir=DIR			Currently ignored
+	--localstatedir=DIR		Currently ignored
+	--libexecdir=DIR		Currently ignored
+	--disable-maintainer-mode	Currently ignored
+	--disable-dependency-tracking	Currently ignored
 
 EOF
 }
@@ -81,8 +95,42 @@ for option; do
 	PREFIX="${option#*=}"
     elif [ "${option%%=*}" = '--libdir' ] ; then
 	LIBDIR="${option#*=}"
+    elif [ "${option%%=*}" = '--includedir' ] ; then
+	INCLUDEDIR="${option#*=}"
+    elif [ "${option%%=*}" = '--mandir' ] ; then
+	MANDIR="${option#*=}"
+    elif [ "${option%%=*}" = '--sysconfdir' ] ; then
+	SYSCONFDIR="${option#*=}"
+    elif [ "${option%%=*}" = '--emacslispdir' ] ; then
+	EMACSLISPDIR="${option#*=}"
+    elif [ "${option%%=*}" = '--build' ] ; then
+	build_option="${option#*=}"
+	case ${build_option} in
+	    *-*-*) ;;
+	    *)
+		echo "Unrecognized value for --build option: ${build_option}"
+		echo "Should be: <cpu>-<vendor>-<os>"
+		echo "See:"
+		echo "	$0 --help"
+		echo ""
+		exit 1
+	esac
+	build_cpu=${build_option%%-*}
+	build_option=${build_option#*-}
+	build_vendor=${build_option%%-*}
+	build_os=${build_option#*-}
+    elif [ "${option%%=*}" = '--infodir' ] ; then
+	true
+    elif [ "${option%%=*}" = '--localstatedir' ] ; then
+	true
+    elif [ "${option%%=*}" = '--libexecdir' ] ; then
+	true
+    elif [ "${option}" = '--disable-maintainer-mode' ] ; then
+	true
+    elif [ "${option}" = '--disable-dependency-tracking' ] ; then
+	true
     else
-	echo "Unrecognized option: ${option}."
+	echo "Unrecognized option: ${option}"
 	echo "See:"
 	echo "	$0 --help"
 	echo ""
@@ -140,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
@@ -169,10 +222,12 @@ else
     have_valgrind=0
 fi
 
-if pkg-config --modversion emacs > /dev/null 2>&1; then
-    emacs_lispdir=$(pkg-config emacs --variable sitepkglispdir)
-else
-    emacs_lispdir='$(prefix)/share/emacs/site-lisp'
+if [ -z "${EMACSLISPDIR}" ]; then
+    if pkg-config --modversion emacs > /dev/null 2>&1; then
+	EMACSLISPDIR=$(pkg-config emacs --variable sitepkglispdir)
+    else
+	EMACSLISPDIR='$(prefix)/share/emacs/site-lisp'
+    fi
 fi
 
 printf "Checking if emacs is available... "
@@ -184,6 +239,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
 
@@ -250,7 +316,7 @@ EOF
 fi
 
 printf "Checking for getline... "
-if ${CC} -o config/have_getline config/have_getline.c > /dev/null 2>&1
+if ${CC} -o compat/have_getline compat/have_getline.c > /dev/null 2>&1
 then
     printf "Yes.\n"
     have_getline=1
@@ -258,7 +324,18 @@ else
     printf "No (will use our own instead).\n"
     have_getline=0
 fi
-rm -f config/have_getline
+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
 
@@ -303,11 +380,20 @@ WARN_CFLAGS=\$(WARN_CXXFLAGS) -Wmissing-declarations
 # The prefix to which notmuch should be installed
 prefix = ${PREFIX}
 
-# The directory to which notmuch libraries should be installed
+# The directory to which libraries should be installed
 libdir = ${LIBDIR:=\$(prefix)/lib}
 
+# The directory to which header files should be installed
+includedir = ${INCLUDEDIR:=\$(prefix)/include}
+
+# The directory to which man pages should be installed
+mandir = ${MANDIR:=\$(prefix)/share/man}
+
+# The directory to which read-only (configuration) filesshould be installed
+sysconfdir = ${SYSCONFDIR:=\$(prefix)/etc}
+
 # The directory to which emacs lisp files should be installed
-emacs_lispdir=${emacs_lispdir}
+emacslispdir=${EMACSLISPDIR}
 
 # Whether there's an emacs binary available for byte-compiling
 HAVE_EMACS = ${have_emacs}
@@ -316,7 +402,7 @@ HAVE_EMACS = ${have_emacs}
 desktop_dir = \$(prefix)/share/applications
 
 # The directory to which bash completions files should be installed
-bash_completion_dir = /etc/bash_completion.d
+bash_completion_dir = \$(sysconfdir)/bash_completion.d
 
 # The directory to which zsh completions files should be installed
 zsh_completion_dir = \$(prefix)/share/zsh/functions/Completion/Unix
@@ -325,6 +411,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}
@@ -346,9 +445,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