From 8a0e314c66e07a5f5f8af4e5508d5a3c938b4812 Mon Sep 17 00:00:00 2001
From: ng0 <ng0@n0.is>
Date: Sat, 16 Nov 2019 13:49:39 +0000
Subject: [PATCH] add -d to bootstrap, enabling what used to be in
 dist_boostrap.

---
 bootstrap      | 31 ++++++++++++++++++++++++++++++-
 dist_bootstrap | 36 ------------------------------------
 2 files changed, 30 insertions(+), 37 deletions(-)
 delete mode 100755 dist_bootstrap

diff --git a/bootstrap b/bootstrap
index 12c7f41f3..07043aa1c 100755
--- a/bootstrap
+++ b/bootstrap
@@ -10,7 +10,6 @@ existence()
     command -v "$1" >/dev/null 2>&1
 }
 
-
 if existence uncrustify; then
     echo "Installing uncrustify hook and configuration"
     # Install uncrustify format symlink (if possible)
@@ -32,6 +31,36 @@ else
     echo "yapf not detected, please install yapf if you plan on contributing python code"
 fi
 
+if test $1 = "-d"; then
+    if existence texi2mdoc; then
+        echo "texi2mdoc: exists, pass --enable-texi2mdoc-generation to configure"
+    else
+        dir=$(dirname "$(readlink -f -- "$0")")
+        mkdir -p $dir/contrib/vendored
+        cd contrib/vendored
+        if existence ftp; then
+            ftp https://mandoc.bsd.lv/texi2mdoc/snapshots/texi2mdoc-0.1.2.tgz
+        elif existence curl; then
+            curl --output texi2mdoc-0.1.2.tgz https://mandoc.bsd.lv/texi2mdoc/snapshots/texi2mdoc-0.1.2.tgz
+        elif existence wget; then
+            wget https://mandoc.bsd.lv/texi2mdoc/snapshots/texi2mdoc-0.1.2.tgz
+        elif existence fetch; then
+            fetch https://mandoc.bsd.lv/texi2mdoc/snapshots/texi2mdoc-0.1.2.tgz
+        else
+            echo "skipping texi2mdoc build, no ftp or curl or wget or fetch found"
+        fi
+        if test -e texi2mdoc-0.1.2.tgz; then
+            tar xzf texi2mdoc-0.1.2.tgz
+            cd texi2mdoc-0.1.2
+            dir=$(dirname "$(readlink -f -- "$0")")
+            make
+            echo "please prepend or append $dir/contrib/vendored/texi2mdoc/ to your PATH before running configure"
+        else
+            echo "no texi2mdoc, skipping"
+        fi
+    fi
+fi
+
 
 echo "checking for libtoolize / libtool... "
 
diff --git a/dist_bootstrap b/dist_bootstrap
deleted file mode 100755
index 8e8d5c98c..000000000
--- a/dist_bootstrap
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/sh
-# This file is in the public domain.
-# SPDX-License-Identifier: 0BSD
-
-dir=$(dirname "$(readlink -f -- "$0")")
-. $dir/bootstrap
-
-if existence texi2mdoc; then
-    echo "texi2mdoc: exists, pass --enable-texi2mdoc-generation to configure"
-else
-    dir=$(dirname "$(readlink -f -- "$0")")
-    mkdir -p $dir/contrib/vendored
-    cd contrib/vendored
-    if existence ftp; then
-        ftp https://mandoc.bsd.lv/texi2mdoc/snapshots/texi2mdoc-0.1.2.tgz
-    elif existence curl; then
-        curl --output texi2mdoc-0.1.2.tgz https://mandoc.bsd.lv/texi2mdoc/snapshots/texi2mdoc-0.1.2.tgz
-    elif existence wget; then
-        wget https://mandoc.bsd.lv/texi2mdoc/snapshots/texi2mdoc-0.1.2.tgz
-    elif existence fetch; then
-        fetch https://mandoc.bsd.lv/texi2mdoc/snapshots/texi2mdoc-0.1.2.tgz
-    else
-        echo "skipping texi2mdoc build, no ftp or curl or wget or fetch found"
-    fi
-    if test -e texi2mdoc-0.1.2.tgz; then
-        tar xzf texi2mdoc-0.1.2.tgz
-        cd texi2mdoc-0.1.2
-        dir=$(dirname "$(readlink -f -- "$0")")
-        #make PREFIX=$dir/../../../contrib/vendored/texi2mdoc
-        #make install PREFIX=$dir/../../../contrib/vendored/texi2mdoc
-        make
-        echo "please prepend or append $dir/contrib/vendored/texi2mdoc/ to your PATH before running configure"
-    else
-        echo "no texi2mdoc, skipping"
-    fi
-fi
-- 
2.25.1