X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=configure;h=49fc7391cc19294c5ded75653407a134327916c5;hp=f3498e3ef2448427430e782845ee69375d936ee6;hb=43eb32527bfb9663a09c8132af840d0b66a85cff;hpb=b191de511e6148112fa2432779f6dc6c7cb501f9

diff --git a/configure b/configure
index f3498e3e..49fc7391 100755
--- a/configure
+++ b/configure
@@ -380,7 +380,7 @@ int main(int argc, char** argv) {
    Xapian::WritableDatabase db("test.db",Xapian::DB_CREATE_OR_OPEN);
 }
 EOF
-    ${CXX} ${CXXLAGS} ${xapian_cxxflags} _default_backend.cc -o _default_backend ${xapian_ldflags}
+    ${CXX} ${CXXFLAGS_for_sh} ${xapian_cxxflags} _default_backend.cc -o _default_backend ${xapian_ldflags}
     ./_default_backend
     if [ -f test.db/iamglass ]; then
 	default_xapian_backend=glass
@@ -491,11 +491,11 @@ else
 fi
 
 if [ -z "${EMACSLISPDIR}" ]; then
-    EMACSLISPDIR='$(prefix)/share/emacs/site-lisp'
+    EMACSLISPDIR="\$(prefix)/share/emacs/site-lisp"
 fi
 
 if [ -z "${EMACSETCDIR}" ]; then
-    EMACSETCDIR='$(prefix)/share/emacs/site-lisp'
+    EMACSETCDIR="\$(prefix)/share/emacs/site-lisp"
 fi
 
 printf "Checking if emacs is available... "