Add a --libdir option to ./configure

[notmuch] / configure

diff --git a/configure b/configure
index fa8e142bb786e0450992abe823c6a9ee26bffb9e..1caff940471ea6ed32b1188364e181b2eff920fb 100755 (executable)
--- a/configure
+++ b/configure
@@ -6,10 +6,12 @@ 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.
 PREFIX=/usr/local
+LIBDIR=${PREFIX}/lib
 
 usage ()
 {
@@ -37,10 +39,18 @@ 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.
 
        --prefix=PREFIX Install files in PREFIX [$PREFIX]
+       --libdir=LIBDIR Install libraries in LIBDIR [$LIBDIR]
 
 By default, "make install" will install the resulting program to
 $PREFIX/bin, documentation to $PREFIX/share, etc. You can
@@ -59,6 +69,8 @@ for option; do
        exit 0
     elif [ "${option%%=*}" = '--prefix' ] ; then
        PREFIX="${option#*=}"
+    elif [ "${option%%=*}" = '--libdir' ] ; then
+       LIBDIR="${option#*=}"
     else
        echo "Unrecognized option: ${option}."
        echo "See:"
@@ -97,14 +109,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
 
@@ -259,9 +275,15 @@ CXXFLAGS = ${CXXFLAGS}
 # The prefix to which notmuch should be installed
 prefix = ${PREFIX}
 
+# The directory to which notmuch libraries should be installed
+libdir = ${LIBDIR}
+
 # The directory to which emacs lisp files should be installed
 emacs_lispdir=${emacs_lispdir}
 
+# The directory to which desktop files should be installed
+desktop_dir = \${prefix}/share/applications
+
 # Whether the getline function is available (if not, then notmuch will
 # build its own version)
 HAVE_GETLINE = ${have_getline}