diff options
| author |  Carl Worth <cworth@cworth.org> | 2009-12-01 17:56:39 -0800 |
|---|---|---|
| committer | Carl Worth <cworth@cworth.org> | 2009-12-01 18:03:31 -0800 |
| commit | 222ee87dfefdd85ddbd7f148d5636746919d4100 (patch) | |
| tree | e13146a6e865ba1b3366e3b595fd544d721215f8 /Makefile | |
| parent | e93520f1091ba67bfad317cfa9a75c4097e28db9 (diff) | |
configure: Resolve all pkg-config flags at configure time.
Previously, we were resolving these within the Makefile. This had
the problem that if pkg-config was not present, the Makefile would
still invoke it resulting in ugly errors before the configure script
was even run, (which would finally present a kind error message about
pkg-config not being present).
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 18 |
1 files changed, 3 insertions, 15 deletions
@@ -10,30 +10,18 @@ EMACS ?= emacs # arguments to gzip. gzip = gzip -# Additional flags that we will append to whatever the user set. -# These aren't intended for the user to manipulate. -extra_cflags := $(shell pkg-config --cflags glib-2.0 gmime-2.4 talloc) -extra_cxxflags := $(shell xapian-config --cxxflags) - -emacs_lispdir := $(shell pkg-config emacs --variable sitepkglispdir) -# Hard-code if this system doesn't have an emacs.pc file -ifeq ($(emacs_lispdir),) - emacs_lispdir = $(prefix)/share/emacs/site-lisp -endif - bash_completion_dir = /etc/bash_completion.d all_deps = Makefile Makefile.local Makefile.config \ lib/Makefile lib/Makefile.local +extra_cflags := +extra_cxxflags := + # Now smash together user's values with our extra values override CFLAGS += $(WARN_CFLAGS) $(extra_cflags) override CXXFLAGS += $(WARN_CXXFLAGS) $(extra_cflags) $(extra_cxxflags) -override LDFLAGS += \ - $(shell pkg-config --libs glib-2.0 gmime-2.4 talloc) \ - $(shell xapian-config --libs) - all: notmuch notmuch.1.gz # Before including any other Makefile fragments, get settings from the |