diff options
author | Carl Worth <cworth@cworth.org> | 2010-10-29 14:49:20 -0700 |
---|---|---|
committer | Carl Worth <cworth@cworth.org> | 2010-10-29 14:49:20 -0700 |
commit | 6e3007bec0b453e40d577bb98350cdc122379385 (patch) | |
tree | ad571a0a28dc4ad75773df30643ef8d2343e56d0 /configure | |
parent | 9d9668e3e7b0e4ed5e054125841dd729a46abd79 (diff) |
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.
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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 |