configure: Move getlinetest.c down into config/have_getline.c.

[notmuch] / configure

diff --git a/configure b/configure
index fe46c8e300233ab37cdc052a9db1b49cae089e4c..ef90a8ba27c40822ed406ab8005bae19ca64c518 100755 (executable)
--- a/configure
+++ b/configure
@@ -7,14 +7,16 @@ We hope that the process of building and installing notmuch is quick
 and smooth so that you can soon be reading and processing your email
 more efficiently than ever.
 
-If anything goes wrong in this process, please do as much as you can
-to figure out what could be different on your machine compared to
-those of the notmuch developers. Then, please email those details to
-Carl Worth <cworth@cworth.org> so that we can hopefully make future
+If anything goes wrong in the configure process, you can override any
+decisions it makes by manually editing the Makefile.config file that
+it creates. Also please do as much as you can to figure out what could
+be different on your machine compared to those of the notmuch
+developers. Then, please email those details to the Notmuch list
+(notmuch@notmuchmail.org) so that we can hopefully make future
 versions of notmuch easier for you to use.
 
-We'll now investigate your system to find verify that various software
-components that notmuch relies on are available.
+We'll now investigate your system to verify that all required
+dependencies are available:
 
 EOF
 
@@ -26,33 +28,47 @@ else
     have_pkg_config=0
 fi
 
+printf "Checking for Xapian development files... "
 if xapian-config --version > /dev/null 2>&1; then
-    echo "Checking for Xapian development files... Yes."
+    printf "Yes.\n"
     have_xapian=1
 else
-    echo "Checking for Xapian development files... No."
+    printf "No.\n"
     have_xapian=0
     errors=$((errors + 1))
 fi
 
+printf "Checking for GMime 2.4 development files... "
 if pkg-config --modversion gmime-2.4 > /dev/null 2>&1; then
-    echo "Checking for GMime 2.4 development files... Yes."
+    printf "Yes.\n"
     have_gmime=1
 else
-    echo "Checking for GMime 2.4 development files... No."
+    printf "No.\n"
     have_gmime=0
     errors=$((errors + 1))
 fi
 
+printf "Checking for talloc development files... "
 if pkg-config --modversion talloc > /dev/null 2>&1; then
-    echo "Checking for talloc development files... Yes."
+    printf "Yes.\n"
     have_talloc=1
 else
-    echo "Checking for talloc development files... No."
+    printf "No.\n"
     have_talloc=0
     errors=$((errors + 1))
 fi
 
+printf "Checking for valgrind development files... "
+if pkg-config --modversion valgrind > /dev/null 2>&1; then
+    printf "Yes.\n"
+    have_valgrind=1
+    valgrind_flags=$(pkg-config --cflags valgrind)
+else
+    printf "No (but that's fine).\n"
+    have_valgrind=0
+    valgrind_flags=
+fi
+
 if [ $errors -gt 0 ]; then
     cat <<EOF
 
@@ -96,8 +112,8 @@ with a command such as:
        sudo apt-get install pkg-config
 
 But if pkg-config is not available for your system, then you will need
-to manually edit the notmuch Makefile to set NOTMUCH_CFLAGS and
-NOTMUCH_LDFLAGS to the correct values without calling pkg-config.
+to manually edit the notmuch Makefile to set the variables such as
+CFLAGS and LDFLAGS to the correct values without calling pkg-config.
 
 EOF
     fi
@@ -108,7 +124,19 @@ configure again to ensure the packages can be found, or simply run
 
 EOF
     exit 1
+fi
+
+printf "Checking for getline... "
+if gcc -o config/have_getline config/have_getline.c > /dev/null 2>&1
+then
+    printf "Yes.\n"
+    have_getline=1
 else
+    printf "No (will use our own instead).\n"
+    have_getline=0
+fi
+rm -f config/have_getline
+
 cat <<EOF
 
 All required packages were found. You may now run the following
@@ -118,6 +146,10 @@ commands to compile and install notmuch:
        sudo make install
 
 EOF
-    exit 0
-fi
-cat <<EOF
+
+# construct the Makefile.config
+cat > Makefile.config <<EOF
+prefix = /usr/local
+HAVE_GETLINE = ${have_getline}
+override CFLAGS += -DHAVE_VALGRIND=${have_valgrind} ${valgrind_flags} -DHAVE_GETLINE=\$(HAVE_GETLINE)
+EOF