X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=configure;h=7e8cd163f950eb8f42656a363fe764b8c71aa670;hp=c522ad8524becfdb28ff73aefefbca6bb08c0411;hb=9d9668e3e7b0e4ed5e054125841dd729a46abd79;hpb=42bda003a0df6c4b798ee1063a01c2ce0b2962e5

diff --git a/configure b/configure
index c522ad85..7e8cd163 100755
--- a/configure
+++ b/configure
@@ -1,12 +1,21 @@
 #! /bin/sh
 
+# Removing space from IFS makes it much easier to support filenames
+# with spaces. See http://www.dwheeler.com/essays/filenames-in-shell.html
+# for gory details.
+IFS="$(printf '\n\t')"
+
+# Since we don't have space in IFS we use tab to separate things in lists
+tab="$(printf '\t')"
+
 # Set several defaults (optionally specified by the user in
 # environemnt variables)
 CC=${CC:-gcc}
 CXX=${CXX:-g++}
 CFLAGS=${CFLAGS:--O2}
 CXXFLAGS=${CXXFLAGS:-\$(CFLAGS)}
-XAPIAN_CONFIG=${XAPIAN_CONFIG:-xapian-config-1.1 xapian-config}
+LDFLAGS=${LDFLAGS:-}
+XAPIAN_CONFIG=${XAPIAN_CONFIG:-xapian-config-1.1${tab}xapian-config}
 
 # We don't allow the EMACS or GZIP Makefile variables inherit values
 # from the environment as we do with CC and CXX above. The reason is
@@ -158,6 +167,12 @@ for option; do
     fi
 done
 
+# We set this value early, (rather than just while printing the
+# Makefile.config file later like most values), because we need to
+# actually investigate this value compared to the ldconfig_paths value
+# below.
+libdir_expanded=${LIBDIR:-${PREFIX}/lib}
+
 cat <<EOF
 Welcome to Notmuch, a system for indexing, searching and tagging your email.
 
@@ -257,15 +272,36 @@ 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
+libdir_in_ldconfig=0
+
+printf "Checking which platform we are on... "
+uname=`uname`
+if [ $uname = "Darwin" ] ; then
+    printf "Mac OS X.\n"
+    platform=MACOSX
     linker_resolves_library_dependencies=0
-else
-    printf "No.\n"
-    mac_os_x=0
+elif [ $uname = "SunOS" ] ; then
+    printf "Solaris.\n"
+    platform=SOLARIS
+    linker_resolves_library_dependencies=0
+elif [ $uname = "Linux" ] ; then
+    printf "Linux\n"
+    platform=LINUX
     linker_resolves_library_dependencies=1
+    ldconfig_paths=$(/sbin/ldconfig -N -X -v 2>/dev/null | sed -n -e 's,^\(/.*\):\( (.*)\)\?$,\1,p')
+    for path in $ldconfig_paths; do
+	echo "Checking $path compared to $libdir_expanded"
+	if [ "$path" = "$libdir_expanded" ]; then
+	    libdir_in_ldconfig=1
+	fi
+    done
+else
+    printf "Unknown.\n"
+    cat <<EOF
+
+*** Warning: Unknown platform. Notmuch might or might not build correctly.
+
+EOF
 fi
 
 if [ $errors -gt 0 ]; then
@@ -389,6 +425,9 @@ CFLAGS = ${CFLAGS}
 # Default FLAGS for C++ compiler (can be overridden by user such as "make CXXFLAGS=-g")
 CXXFLAGS = ${CXXFLAGS}
 
+# Default FLAGS for the linker (can be overridden by user such as "make LDFLAGS=-znow")
+LDFLAGS = ${LDFLAGS}
+
 # Flags to enable warnings when using the C++ compiler
 WARN_CXXFLAGS=-Wall -Wextra -Wwrite-strings -Wswitch-enum
 
@@ -396,11 +435,18 @@ WARN_CXXFLAGS=-Wall -Wextra -Wwrite-strings -Wswitch-enum
 WARN_CFLAGS=\$(WARN_CXXFLAGS) -Wmissing-declarations
 
 # The prefix to which notmuch should be installed
+# Note: If you change this value here, be sure to ensure that the
+# LIBDIR_IN_LDCONFIG value below is still set correctly.
 prefix = ${PREFIX}
 
 # The directory to which libraries should be installed
+# Note: If you change this value here, be sure to ensure that the
+# LIBDIR_IN_LDCONFIG value below is still set correctly.
 libdir = ${LIBDIR:=\$(prefix)/lib}
 
+# Whether libdir is in a path configured into ldconfig
+LIBDIR_IN_LDCONFIG = ${libdir_in_ldconfig}
+
 # The directory to which header files should be installed
 includedir = ${INCLUDEDIR:=\$(prefix)/include}
 
@@ -433,9 +479,8 @@ HAVE_GETLINE = ${have_getline}
 # 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}
+# Supported platforms (so far) are: LINUX, MACOSX, SOLARIS
+PLATFORM = ${platform}
 
 # Whether the linker will automatically resolve the dependency of one
 # library on another (if not, then linking a binary requires linking