From a66db6e540049cef813d1e4a20aa32c3dc755dc6 Mon Sep 17 00:00:00 2001 From: Ingo Schwarze Date: Fri, 13 Mar 2020 17:31:44 +0000 Subject: Make the "make depend" maintainer target more convenient by having it run ./configure with native fts and ohash disabled. --- configure | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) (limited to 'configure') diff --git a/configure b/configure index 053fe43f..ddec471c 100755 --- a/configure +++ b/configure @@ -1,8 +1,8 @@ #!/bin/sh # -# $Id: configure,v 1.72 2020/02/05 15:12:11 schwarze Exp $ +# $Id: configure,v 1.73 2020/03/13 17:31:44 schwarze Exp $ # -# Copyright (c) 2014-2019 Ingo Schwarze +# Copyright (c) 2014-2020 Ingo Schwarze # # Permission to use, copy, modify, and distribute this software for any # purpose with or without fee is hereby granted, provided that the above @@ -327,7 +327,13 @@ if [ ${HAVE_ENDIAN} -eq 0 -a \ exit 1 fi -if ismanual fts FTS ${HAVE_FTS}; then +if [ "$1" == "-depend" ]; then + HAVE_FTS=0 + HAVE_FTS_COMPARE_CONST=0 + echo "tested fts: HAVE_FTS=0 (for make depend)" 1>&2 + echo "tested fts: HAVE_FTS=0 (for make depend)" 1>&3 + echo 1>&3 +elif ismanual fts FTS ${HAVE_FTS}; then HAVE_FTS_COMPARE_CONST=0 elif runtest fts FTS_COMPARE_CONST -DFTS_COMPARE_CONST; then HAVE_FTS=1 @@ -406,7 +412,12 @@ if [ ${BUILD_CATMAN} -gt 0 ]; then fi # --- ohash --- -if ismanual ohash OHASH "${HAVE_OHASH}"; then +if [ "$1" == "-depend" ]; then + HAVE_OHASH=0 + echo "tested ohash: HAVE_OHASH=0 (for make depend)" 1>&2 + echo "tested ohash: HAVE_OHASH=0 (for make depend)" 1>&3 + echo 1>&3 +elif ismanual ohash OHASH "${HAVE_OHASH}"; then : elif [ -n "${LD_OHASH}" ]; then runtest ohash OHASH "${LD_OHASH}" || true -- cgit v1.2.3-56-ge451