aboutsummaryrefslogtreecommitdiffhomepage
path: root/configure
diff options
context:
space:
mode:
authorGravatar Carl Worth <cworth@cworth.org>2009-12-01 16:00:31 -0800
committerGravatar Carl Worth <cworth@cworth.org>2009-12-01 16:33:25 -0800
commit650f6ac573ae6d08dbd2752fe58e670b28fee957 (patch)
tree8a26b29356b3ce783518dbecf0204f551b47252b /configure
parent3054bc462c8f31965f342808fce48c72f2858cfc (diff)
configure: Assimilate new getlinetest into recent configure conventions.
We're now using printf to print what we're checking before we check. We're also making variables such as HAVE_GETLINE available to both make and to the C pre-processor. With this, the local getline implementation is now only compiled if not available on the system.
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure11
1 files changed, 7 insertions, 4 deletions
diff --git a/configure b/configure
index 1b5f7e04..bb1f0dbc 100755
--- a/configure
+++ b/configure
@@ -126,12 +126,14 @@ EOF
exit 1
fi
+printf "Checking for getline... "
if ! gcc -o getlinetest getlinetest.c > /dev/null 2>&1
then
- echo "Checking for getline... No."
- getline=-Dgetline=_notmuch_getline
+ printf "No.\n"
+ have_getline=0
else
- echo "Checking for getline... Yes."
+ printf "Yes.\n"
+ have_getline=1
fi
rm -f getlinetest
@@ -148,5 +150,6 @@ EOF
# construct the Makefile.config
cat > Makefile.config <<EOF
prefix = /usr/local
-override CFLAGS += -DHAVE_VALGRIND=${have_valgrind} ${valgrind_flags} ${getline}
+HAVE_GETLINE = ${have_getline}
+override CFLAGS += -DHAVE_VALGRIND=${have_valgrind} ${valgrind_flags} -DHAVE_GETLINE=\$(HAVE_GETLINE)
EOF