X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;ds=sidebyside;f=configure;h=bb1f0dbc22b4519521ee47f7aef41dc2e6b0e532;hb=e806e723c8ac8f97a3f8ba0e0048708a8f5bb475;hp=2ceda74bc65c3d237ab3449340533b495a086d49;hpb=6320695223e466a285a77fe0d30fff0ff5e89172;p=notmuch

diff --git a/configure b/configure
index 2ceda74b..bb1f0dbc 100755
--- a/configure
+++ b/configure
@@ -61,10 +61,12 @@ fi
 printf "Checking for valgrind development files... "
 if pkg-config --modversion valgrind > /dev/null 2>&1; then
     printf "Yes.\n"
-    have_valgrind=-DHAVE_VALGRIND
+    have_valgrind=1
+    valgrind_flags=$(pkg-config --cflags valgrind)
 else
     printf "No (but that's fine).\n"
-    have_valgrind=
+    have_valgrind=0
+    valgrind_flags=
 fi
 
 if [ $errors -gt 0 ]; then
@@ -124,6 +126,17 @@ EOF
     exit 1
 fi
 
+printf "Checking for getline... "
+if ! gcc -o getlinetest getlinetest.c > /dev/null 2>&1
+then
+    printf "No.\n"
+    have_getline=0
+else
+    printf "Yes.\n"
+    have_getline=1
+fi
+rm -f getlinetest
+
 cat <<EOF
 
 All required packages were found. You may now run the following
@@ -137,5 +150,6 @@ EOF
 # construct the Makefile.config
 cat > Makefile.config <<EOF
 prefix = /usr/local
-CFLAGS += ${have_valgrind}
+HAVE_GETLINE = ${have_getline}
+override CFLAGS += -DHAVE_VALGRIND=${have_valgrind} ${valgrind_flags} -DHAVE_GETLINE=\$(HAVE_GETLINE)
 EOF