diff options
| -rw-r--r-- | Makefile | 11 | ||||
| -rwxr-xr-x | configure | 11 |
2 files changed, 13 insertions, 9 deletions
@@ -34,16 +34,17 @@ override LDFLAGS += \ all: notmuch notmuch.1.gz -include lib/Makefile.local -include compat/Makefile.local -include Makefile.local - -# And get user settings from the output of configure +# Before including any other Makefile fragments, get settings from the +# output of configure Makefile.config: configure ./configure include Makefile.config +include lib/Makefile.local +include compat/Makefile.local +include Makefile.local + # The user has not set any verbosity, default to quiet mode and inform the # user how to enable verbose compiles. ifeq ($(V),) @@ -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 |