aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Carl Worth <cworth@cworth.org>2009-12-01 16:56:39 -0800
committerGravatar Carl Worth <cworth@cworth.org>2009-12-01 16:56:39 -0800
commite93520f1091ba67bfad317cfa9a75c4097e28db9 (patch)
tree7fde767d45c4fb79a9b303abcd8bf79f47c1ffa1
parent1466e249e741e3ef907e8c48c2861742b676e255 (diff)
configure: Move getlinetest.c down into config/have_getline.c.
This keeps configure-related clutter out of the main directory, and also gives a more direct correlation between the name of the test and the feature being tested for.
-rw-r--r--config/README5
-rw-r--r--config/have_getline.c13
-rwxr-xr-xconfigure10
-rw-r--r--getlinetest.c13
4 files changed, 23 insertions, 18 deletions
diff --git a/config/README b/config/README
new file mode 100644
index 00000000..eabfe285
--- /dev/null
+++ b/config/README
@@ -0,0 +1,5 @@
+notmuch/config
+
+This directory consists of small programs used by the notmuch
+configure script to test for the availability of certain system
+features, (library functions, etc.).
diff --git a/config/have_getline.c b/config/have_getline.c
new file mode 100644
index 00000000..a8bcd17e
--- /dev/null
+++ b/config/have_getline.c
@@ -0,0 +1,13 @@
+#define _GNU_SOURCE
+#include <stdio.h>
+#include <sys/types.h>
+
+int main()
+{
+ ssize_t count = 0;
+ size_t n = 0;
+ char **lineptr = NULL;
+ FILE *stream = NULL;
+
+ count = getline(lineptr, &n, stream);
+}
diff --git a/configure b/configure
index bb1f0dbc..ef90a8ba 100755
--- a/configure
+++ b/configure
@@ -127,15 +127,15 @@ EOF
fi
printf "Checking for getline... "
-if ! gcc -o getlinetest getlinetest.c > /dev/null 2>&1
+if gcc -o config/have_getline config/have_getline.c > /dev/null 2>&1
then
- printf "No.\n"
- have_getline=0
-else
printf "Yes.\n"
have_getline=1
+else
+ printf "No (will use our own instead).\n"
+ have_getline=0
fi
-rm -f getlinetest
+rm -f config/have_getline
cat <<EOF
diff --git a/getlinetest.c b/getlinetest.c
deleted file mode 100644
index 2a21a501..00000000
--- a/getlinetest.c
+++ /dev/null
@@ -1,13 +0,0 @@
-#define _GNU_SOURCE
-#include <stdio.h>
-#include <sys/types.h>
-
-int main()
-{
- ssize_t count = 0;
- size_t n = 0;
- char **lineptr = NULL;
- FILE *stream = NULL;
-
- count = getline(lineptr, &n, stream);
-}