X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;ds=sidebyside;f=configure;h=1e17b4649f8ebf97f77a5e0b2d0d43e1e9c6f490;hb=a63b5db87340ce6f031b7a20f40754995ad95ce4;hp=13a8dcabbff53e65d23deefa0bb94ccf22fad9e6;hpb=d038b9320949c79503fe4b76870aaabf279405ab;p=notmuch

diff --git a/configure b/configure
index 13a8dcab..1e17b464 100755
--- a/configure
+++ b/configure
@@ -38,7 +38,7 @@ if [ "$srcdir" != "." ]; then
     cp -a "$srcdir"/test/* test
 
     # Emacs only likes to generate compiled files next to the .el files
-    # by default so copy these as well (which is not ideal0.
+    # by default so copy these as well (which is not ideal).
     cp -a "$srcdir"/emacs/*.el emacs
 fi
 
@@ -65,6 +65,7 @@ PYTHON=${PYTHON:-}
 # options.
 PREFIX=/usr/local
 LIBDIR=
+WITH_DOCS=1
 WITH_EMACS=1
 WITH_BASH=1
 WITH_ZSH=1
@@ -98,7 +99,7 @@ First, some common variables can specified via environment variables:
 
 	CC		The C compiler to use
 	CFLAGS		Flags to pass to the C compiler
-        CPPFLAGS	Flags to pass to the C preprocessor
+	CPPFLAGS	Flags to pass to the C preprocessor
 	CXX		The C++ compiler to use
 	CXXFLAGS	Flags to pass to the C compiler
 	LDFLAGS		Flags to pass when linking
@@ -138,13 +139,14 @@ Fine tuning of some installation directories is available:
 
 Some specific library versions can be specified (auto-detected otherwise):
 
-        --with-gmime-version=VERS       Specify GMIME version (2.4 or 2.6)
+	--with-gmime-version=VERS       Specify GMIME version (2.4 or 2.6)
 
 Some features can be disabled (--with-feature=no is equivalent to
 --without-feature) :
 
-	--without-emacs			Do not install lisp file
 	--without-bash-completion	Do not install bash completions files
+	--without-docs			Do not install documentation and man pages
+	--without-emacs			Do not install lisp file
 	--without-zsh-completion	Do not install zsh completions files
 
 Additional options are accepted for compatibility with other
@@ -185,6 +187,8 @@ for option; do
 	BASHCOMPLETIONDIR="${option#*=}"
     elif [ "${option%%=*}" = '--zshcompletiondir' ] ; then
 	ZSHCOMLETIONDIR="${option#*=}"
+    elif [ "${option}" = '--without-docs' ] ; then
+	WITH_DOCS=0
     elif [ "${option%%=*}" = '--with-emacs' ]; then
 	if [ "${option#*=}" = 'no' ]; then
 	    WITH_EMACS=0
@@ -330,13 +334,13 @@ have_xapian_compact=0
 if [ ${have_xapian} = "1" ]; then
     printf "Checking for Xapian compaction support... "
     case "${xapian_version}" in
-        0.*|1.[01].*|1.2.[0-5])
-            printf "No (only available with Xapian > 1.2.6).\n" ;;
-        [1-9]*.[0-9]*.[0-9]*)
-            have_xapian_compact=1
-            printf "Yes.\n" ;;
-        *)
-            printf "Unknown version.\n" ;;
+	0.*|1.[01].*|1.2.[0-5])
+	    printf "No (only available with Xapian > 1.2.6).\n" ;;
+	[1-9]*.[0-9]*.[0-9]*)
+	    have_xapian_compact=1
+	    printf "Yes.\n" ;;
+	*)
+	    printf "Unknown version.\n" ;;
     esac
 fi
 
@@ -466,13 +470,15 @@ else
     have_emacs=0
 fi
 
-printf "Checking if doxygen is available... "
-if command -v doxygen > /dev/null; then
-    printf "Yes.\n"
-    have_doxygen=1
-else
-    printf "No (so will not install api docs)\n"
-    have_doxygen=0
+have_doxygen=0
+if [ $WITH_DOCS = "1" ] ; then
+    printf "Checking if doxygen is available... "
+    if command -v doxygen > /dev/null; then
+	printf "Yes.\n"
+	have_doxygen=1
+    else
+	printf "No (so will not install api docs)\n"
+    fi
 fi
 
 printf "Checking for ruby development files... "
@@ -484,13 +490,15 @@ else
     have_ruby_dev=0
 fi
 
-printf "Checking if sphinx is available and supports nroff output... "
-if command -v sphinx-build > /dev/null && ${python} -m sphinx.writers.manpage > /dev/null 2>&1 ; then
-    printf "Yes.\n"
-    have_sphinx=1
-else
-    printf "No (so will not install man pages).\n"
-    have_sphinx=0
+have_sphinx=0
+if [ $WITH_DOCS = "1" ] ; then
+    printf "Checking if sphinx is available and supports nroff output... "
+    if command -v sphinx-build > /dev/null && ${python} -m sphinx.writers.manpage > /dev/null 2>&1 ; then
+	printf "Yes.\n"
+	have_sphinx=1
+    else
+	printf "No (so will not install man pages).\n"
+    fi
 fi
 
 libdir_in_ldconfig=0
@@ -751,6 +759,16 @@ else
     as_needed_ldflags=""
 fi
 
+printf "Checking for -Wl,--no-undefined... "
+if ${CC} -Wl,--no-undefined -o minimal minimal.c >/dev/null 2>&1
+then
+    printf "Yes.\n"
+    no_undefined_ldflags="-Wl,--no-undefined"
+else
+    printf "No (nothing to worry about).\n"
+    no_undefined_ldflags=""
+fi
+
 WARN_CXXFLAGS=""
 printf "Checking for available C++ compiler warning flags... "
 for flag in -Wall -Wextra -Wwrite-strings; do
@@ -955,6 +973,9 @@ RPATH_LDFLAGS = ${rpath_ldflags}
 # Flags needed to have linker link only to necessary libraries
 AS_NEEDED_LDFLAGS = ${as_needed_ldflags}
 
+# Flags to have the linker flag undefined symbols in object files
+NO_UNDEFINED_LDFLAGS = ${no_undefined_ldflags}
+
 # Whether valgrind header files are available
 HAVE_VALGRIND = ${have_valgrind}