mirror of
https://git.notmuchmail.org/git/notmuch
synced 2024-11-25 04:18:08 +01:00
configure: Set XAPIAN_CONFIG to only "xapian-config" by default.
Previously, we preferred a value of "xapian-config-1.1" first. This was convenient for compiling against Xapian 1.1 while Xapian 1.2 was unreleased. But now that Xapian 1.2 is realease, and since it ships a xapian-config, the xapian-config-1.1 value can mask the newer library. Instead of trying to track the latest xapian-config-1.x in our configure script let's simply expect the user to set XAPIAN_CONFIG=xapian-config-1.x in order to compile against an unreleased Xapian.
This commit is contained in:
parent
9d9668e3e7
commit
6e3007bec0
1 changed files with 1 additions and 1 deletions
2
configure
vendored
2
configure
vendored
|
@ -15,7 +15,7 @@ CXX=${CXX:-g++}
|
|||
CFLAGS=${CFLAGS:--O2}
|
||||
CXXFLAGS=${CXXFLAGS:-\$(CFLAGS)}
|
||||
LDFLAGS=${LDFLAGS:-}
|
||||
XAPIAN_CONFIG=${XAPIAN_CONFIG:-xapian-config-1.1${tab}xapian-config}
|
||||
XAPIAN_CONFIG=${XAPIAN_CONFIG:-xapian-config}
|
||||
|
||||
# We don't allow the EMACS or GZIP Makefile variables inherit values
|
||||
# from the environment as we do with CC and CXX above. The reason is
|
||||
|
|
Loading…
Reference in a new issue