X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=configure;h=d14e7d17a91a99ddf368a6204060c99c721de8f7;hp=3f0c8d5215e85b6eb30f533e323e94898ab020d3;hb=2dfbb7598b6869511c5d654221664bc9b2230413;hpb=10224335514b70acc95f89ced4d900bd6c94990b

diff --git a/configure b/configure
index 3f0c8d52..d14e7d17 100755
--- a/configure
+++ b/configure
@@ -45,7 +45,7 @@ fi
 # environment variables)
 CC=${CC:-cc}
 CXX=${CXX:-c++}
-CFLAGS=${CFLAGS:--O2}
+CFLAGS=${CFLAGS:--g -O2}
 CPPFLAGS=${CPPFLAGS:-}
 CXXFLAGS=${CXXFLAGS:-\$(CFLAGS)}
 LDFLAGS=${LDFLAGS:-}
@@ -724,16 +724,6 @@ printf "\n\t${WARN_CFLAGS}\n"
 
 rm -f minimal minimal.c
 
-cat <<EOF
-
-All required packages were found. You may now run the following
-commands to compile and install notmuch:
-
-	make
-	sudo make install
-
-EOF
-
 # construct the Makefile.config
 cat > Makefile.config <<EOF
 # This Makefile.config was automatically generated by the ./configure
@@ -956,3 +946,27 @@ CONFIGURE_CXXFLAGS = -DHAVE_GETLINE=\$(HAVE_GETLINE) \$(GMIME_CFLAGS)    \\
 
 CONFIGURE_LDFLAGS =  \$(GMIME_LDFLAGS) \$(TALLOC_LDFLAGS) \$(ZLIB_LDFLAGS) \$(XAPIAN_LDFLAGS)
 EOF
+
+# construct the sh.config
+cat > sh.config <<EOF
+# This sh.config was automatically generated by the ./configure
+# script of notmuch.
+
+# Whether the Xapian version in use supports compaction
+NOTMUCH_HAVE_XAPIAN_COMPACT=${have_xapian_compact}
+
+# Whether there's either sphinx or rst2man available for building
+# documentation
+NOTMUCH_HAVE_MAN=$((have_sphinx || have_rst2man))
+EOF
+
+# Finally, after everything configured, inform the user how to continue.
+cat <<EOF
+
+All required packages were found. You may now run the following
+commands to compile and install notmuch:
+
+	make
+	sudo make install
+
+EOF