Put $(LDFLAGS) after the list of object files.

Some linkers on some systems are particularly picky about the order of
arguments in order to properly linkt. So this fixes failures on some
systems.

diff --git a/Makefile.local b/Makefile.local
index 6bc01a5db8e66733efeca1943cda6c37e2d0165c..c44d160378ea7f89f7f98f8dfff941aa825a00b9 100644 (file)
--- a/Makefile.local
+++ b/Makefile.local
@@ -18,7 +18,7 @@ notmuch_client_srcs =         \
 
 notmuch_client_modules = $(notmuch_client_srcs:.c=.o)
 notmuch: $(notmuch_client_modules) lib/notmuch.a
-       $(CXX) $(LDFLAGS) $^ -o $@
+       $(CXX) $^ $(LDFLAGS) -o $@
 
 notmuch.1.gz: notmuch.1
        gzip --stdout notmuch.1 > notmuch.1.gz

diff --git a/notmuch-completion.bash b/notmuch-completion.bash
index 8665268c789eda9b789849bf999d59f0a4f87aa3..03412117bb1c6240c0d7c7fe8b481341d8146c8e 100644 (file)
--- a/notmuch-completion.bash
+++ b/notmuch-completion.bash
@@ -50,7 +50,7 @@ _notmuch()
 
     commands="setup new search show reply tag dump restore help"
     help_options="setup new search show reply tag dump restore search-terms"
-    search_options="--max-threads= --first= --sort="
+    search_options="--max-threads= --first= --sort=oldest-first --sort=newest-first"
 
     COMPREPLY=()