Make the "make depend" maintainer target more convenient

by having it run ./configure with native fts and ohash disabled.

diff --git a/Makefile b/Makefile
index e0b9a66b5b6b105b6bbe4a42cf6c50eeac12bbaf..a8ee2c40867153c91131e38fb9341a77c3aa9625 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.531 2020/03/13 15:32:28 schwarze Exp $
+# $Id: Makefile,v 1.532 2020/03/13 17:31:44 schwarze Exp $
 #
 # Copyright (c) 2011, 2013-2020 Ingo Schwarze <schwarze@openbsd.org>
 # Copyright (c) 2010, 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
@@ -401,6 +401,7 @@ clean:
        rm -f demandoc $(DEMANDOC_OBJS)
        rm -f soelim $(SOELIM_OBJS)
        rm -f $(WWW_MANS) $(WWW_INCS) mandoc*.tar.gz mandoc*.sha256
+       rm -f Makefile.tmp1 Makefile.tmp2
        rm -rf *.dSYM
 
 base-install: mandoc demandoc soelim
@@ -545,11 +546,13 @@ www-install: www
        $(INSTALL_DATA) $(WWW_INCS) $(HTDOCDIR)/includes
 
 depend: config.h
-       mkdep -f Makefile.depend $(CFLAGS) $(SRCS)
+       ./configure -depend
+       mkdep -f Makefile.tmp1 $(CFLAGS) $(SRCS)
        perl -e 'undef $$/; $$_ = <>; s|/usr/include/\S+||g; \
                s|\\\n||g; s|  +| |g; s| $$||mg; print;' \
-               Makefile.depend > Makefile.tmp
-       mv Makefile.tmp Makefile.depend
+               Makefile.tmp1 > Makefile.tmp2
+       rm Makefile.tmp1
+       mv Makefile.tmp2 Makefile.depend
 
 regress-distclean:
        @find regress \

diff --git a/configure b/configure
index 053fe43f668cfd82b0a5725ae807abdcd2ee3811..ddec471c1f7b23e8461dc11df9e6b61e737fb44f 100755 (executable)
--- 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 <schwarze@openbsd.org>
+# Copyright (c) 2014-2020 Ingo Schwarze <schwarze@openbsd.org>
 #
 # 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