diff options
author | martin f. krafft <madduck@debian.org> | 2010-01-21 13:58:55 +1300 |
---|---|---|
committer | martin f. krafft <madduck@debian.org> | 2010-01-21 13:58:55 +1300 |
commit | 0ea5f3fc0e0336921ba670a28201b59d2c977cfb (patch) | |
tree | 86f91b3512899130341aabea68686c4aea113a6a /configure | |
parent | 994e46845d57c4cf912b674d45b4ae13b478d6ee (diff) | |
parent | c340c1bd1140c0a1b7e0f24ef3ebac806f5fc3e6 (diff) |
Merge branch 'upstream'
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 26 |
1 files changed, 19 insertions, 7 deletions
@@ -6,6 +6,7 @@ CC=${CC:-gcc} CXX=${CXX:-g++} CFLAGS=${CFLAGS:--O2} 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 # 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 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 command line. @@ -91,14 +99,18 @@ else fi printf "Checking for Xapian development files... " -if xapian-config --version > /dev/null 2>&1; then - printf "Yes.\n" - have_xapian=1 - xapian_cxxflags=$(xapian-config --cxxflags) - xapian_ldflags=$(xapian-config --libs) -else +have_xapian=0 +for xapian_config in ${XAPIAN_CONFIG}; do + if ${xapian_config} --version > /dev/null 2>&1; then + printf "Yes.\n" + have_xapian=1 + xapian_cxxflags=$(${xapian_config} --cxxflags) + xapian_ldflags=$(${xapian_config} --libs) + break + fi +done +if [ ${have_xapian} = "0" ]; then printf "No.\n" - have_xapian=0 errors=$((errors + 1)) fi |