From: Carl Worth <cworth@cworth.org>
Date: Fri, 29 Oct 2010 21:49:20 +0000 (-0700)
Subject: configure: Set XAPIAN_CONFIG to only "xapian-config" by default.
X-Git-Tag: 0.4~25
X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=6e3007bec0b453e40d577bb98350cdc122379385

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.
---

diff --git a/configure b/configure
index 7e8cd163..5e360d8c 100755
--- a/configure
+++ b/configure
@@ -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