debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-12-22 17:34:54 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

configure: Look for both Xapian 1.1 and 1.0 and allow user override.

Browse source 
The in-development version of Xapian provides a config program named
xapian-config-1.1 while the released version provides a program named
xapian-config instead. By default, we now try each of these in turn,
and we also allow the user to set a XAPIAN_CONFIG environment variable
to explicitly specify a particular program.
This commit is contained in:
Carl Worth 2009-12-13 15:17:35 -08:00
parent dac01ec520
commit 3f406fdefc
1 changed files with 19 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
configure vendored
View file

@ -6,6 +6,7 @@ CC=${CC:-gcc}
CXX=${CXX:-g++} CXX=${CXX:-g++}
CFLAGS=${CFLAGS:--O2} CFLAGS=${CFLAGS:--O2}
CXXFLAGS=${CXXFLAGS:-\$(CFLAGS)} CXXFLAGS=${CXXFLAGS:-\$(CFLAGS)}
XAPIAN_CONFIG=${XAPIAN_CONFIG:-xapian-config-1.1 xapian-config}
# Set the defaults for values the user can specify with command-line # Set the defaults for values the user can specify with command-line
# options. # options.
@ -37,6 +38,13 @@ First, some common variables can specified via environment variables:
Each of these values can further be controlled by specifying them Each of these values can further be controlled by specifying them
later on the "make" command line. later on the "make" command line.
Other environment variables can be used to control configure itself,
(and for which there is no equivalent build-time control):
XAPIAN_CONFIG The program to use to determine flags for
compiling and linking against the Xapian
library. [$XAPIAN_CONFIG]
Additionally, various options can be specified on the configure Additionally, various options can be specified on the configure
command line. command line.
@ -97,14 +105,18 @@ else
fi fi
printf "Checking for Xapian development files... " printf "Checking for Xapian development files... "
if xapian-config --version > /dev/null 2>&1; then have_xapian=0
for xapian_config in ${XAPIAN_CONFIG}; do
if ${xapian_config} --version > /dev/null 2>&1; then
printf "Yes.\n" printf "Yes.\n"
have_xapian=1 have_xapian=1
xapian_cxxflags=$(xapian-config --cxxflags) xapian_cxxflags=$(${xapian_config} --cxxflags)
xapian_ldflags=$(xapian-config --libs) xapian_ldflags=$(${xapian_config} --libs)
else break
fi
done
if [ ${have_xapian} = "0" ]; then
printf "No.\n" printf "No.\n"
have_xapian=0
errors=$((errors + 1)) errors=$((errors + 1))
fi fi