fixup

[notmuch] / configure

diff --git a/configure b/configure
index c5bcd07159421f5ba7959fed015d9bc3ed3f3525..1d93b2e4f20e2930b10018d3eab5e551b92ccdd7 100755 (executable)
--- a/configure
+++ b/configure
@@ -290,7 +290,6 @@ elif [ $uname = "Linux" ] ; then
     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
@@ -393,6 +392,16 @@ rm -f compat/have_strcasestr
 
 printf "int main(void){return 0;}\n" > minimal.c
 
+printf "Checking for rpath support... "
+if ${CC} -Wl,--enable-new-dtags -Wl,-rpath,/tmp/ -o minimal minimal.c >/dev/null 2>&1
+then
+    printf "Yes.\n"
+    rpath_ldflags="-Wl,--enable-new-dtags -Wl,-rpath,\$(libdir)"
+else
+    printf "No (nothing to worry about).\n"
+    rpath_ldflags=""
+fi
+
 WARN_CXXFLAGS=""
 printf "Checking for available C++ compiler warning flags... "
 for flag in -Wall -Wextra -Wwrite-strings -Wswitch-enum; do
@@ -523,6 +532,9 @@ GMIME_LDFLAGS = ${gmime_ldflags}
 TALLOC_CFLAGS = ${talloc_cflags}
 TALLOC_LDFLAGS = ${talloc_ldflags}
 
+# Flags needed to have linker set rpath attribute
+RPATH_LDFLAGS = ${rpath_ldflags}
+
 # Whether valgrind header files are available
 HAVE_VALGRIND = ${have_valgrind}