Add test to configure script to detect getline

[notmuch] / configure

diff --git a/configure b/configure
index b4770ec9ee2f28a69b2b16c4fba247f03b698543..1b5f7e04eee3f584ac4c8a56d1c58d03dc221d06 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.
 
 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.
 
 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
 
 
 EOF
 


@@ -26,39 +28,45 @@ else
     have_pkg_config=0
 fi
 
     have_pkg_config=0
 fi
 

+printf "Checking for Xapian development files... "

 if xapian-config --version > /dev/null 2>&1; then
 if xapian-config --version > /dev/null 2>&1; then

-    echo "Checking for Xapian development files... Yes."
+    printf "Yes.\n"

     have_xapian=1
 else
     have_xapian=1
 else

-    echo "Checking for Xapian development files... No."
+    printf "No.\n"

     have_xapian=0
     errors=$((errors + 1))
 fi
 
     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
 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
     have_gmime=1
 else

-    echo "Checking for GMime 2.4 development files... No."
+    printf "No.\n"

     have_gmime=0
     errors=$((errors + 1))
 fi
 
     have_gmime=0
     errors=$((errors + 1))
 fi
 

+printf "Checking for talloc development files... "

 if pkg-config --modversion talloc > /dev/null 2>&1; then
 if pkg-config --modversion talloc > /dev/null 2>&1; then

-    echo "Checking for talloc development files... Yes."
+    printf "Yes.\n"

     have_talloc=1
 else
     have_talloc=1
 else

-    echo "Checking for talloc development files... No."
+    printf "No.\n"

     have_talloc=0
     errors=$((errors + 1))
 fi
 
     have_talloc=0
     errors=$((errors + 1))
 fi
 

+printf "Checking for valgrind development files... "

 if pkg-config --modversion valgrind > /dev/null 2>&1; then
 if pkg-config --modversion valgrind > /dev/null 2>&1; then

-    echo "Checking for valgrind development files... Yes."
-    have_valgrind=-DHAVE_VALGRIND
+    printf "Yes.\n"
+    have_valgrind=1
+    valgrind_flags=$(pkg-config --cflags valgrind)

 else
 else

-    echo "Checking for valgrind development files... No."
-    have_valgrind=
+    printf "No (but that's fine).\n"
+    have_valgrind=0
+    valgrind_flags=

 fi
 
 if [ $errors -gt 0 ]; then
 fi
 
 if [ $errors -gt 0 ]; then


@@ -104,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
        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
 
 EOF
     fi


@@ -118,6 +126,15 @@ EOF
     exit 1
 fi
 
     exit 1
 fi
 

+if ! gcc -o getlinetest getlinetest.c > /dev/null 2>&1
+then
+    echo "Checking for getline... No."
+    getline=-Dgetline=_notmuch_getline
+else
+    echo "Checking for getline... Yes."
+fi
+rm -f getlinetest
+

 cat <<EOF
 
 All required packages were found. You may now run the following
 cat <<EOF
 
 All required packages were found. You may now run the following


@@ -131,6 +148,5 @@ EOF
 # construct the Makefile.config
 cat > Makefile.config <<EOF
 prefix = /usr/local
 # construct the Makefile.config
 cat > Makefile.config <<EOF
 prefix = /usr/local

-bash_completion_dir = /etc/bash_completion.d
-CFLAGS += ${have_valgrind}
+override CFLAGS += -DHAVE_VALGRIND=${have_valgrind} ${valgrind_flags} ${getline}

 EOF
 EOF