Merge branch 'master' of git+ssh://wbx@openadk.org/git/openadk

5 files changed, 15 insertions, 88 deletions

diff --git a/scripts/autoconf b/scripts/autoconf
deleted file mode 100755
index ce75759cf..000000000
--- a/scripts/autoconf
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/usr/bin/env bash
-# This file is part of the OpenADK project. OpenADK is copyrighted
-# material, please see the LICENCE file in the top-level directory.
-
-ac262=$(which autoconf-2.62)
-ac261=$(which autoconf-2.61)
-
-if [ ! -z "$ac262" -a -x "$ac262" ];then
-	if [ -x /usr/bin/autoconf ];then
-		AUTOCONF_VERSION=2.62 /usr/bin/autoconf "$@"
-	else
-		AUTOCONF_VERSION=2.62 /usr/local/bin/autoconf "$@"
-	fi
-elif [ ! -z "$ac261" -a -x "$ac261" ];then
-	if [ -x /usr/bin/autoconf ];then
-		AUTOCONF_VERSION=2.61 /usr/bin/autoconf "$@"
-	else
-		AUTOCONF_VERSION=2.61 /usr/local/bin/autoconf "$@"
-	fi
-else
-	if [ -x /usr/bin/autoconf ];then
-		/usr/bin/autoconf "$@"
-	else
-		/usr/local/bin/autoconf "$@"
-	fi
-fi
diff --git a/scripts/automake.dep b/scripts/automake.dep
index c729e87a1..901d12912 100644
--- a/scripts/automake.dep
+++ b/scripts/automake.dep
@@ -11,6 +11,8 @@ aclocal.m4 acinclude.m4
 config.h.in configure.in
 config.h.in configure.ac
 config.h.in aclocal.m4
+config.h.in autoconfig.h.in
+config.h.in gpsd_config.h.in
 configure configure.in
 configure configure.ac
 configure aclocal.m4
diff --git a/scripts/autoreconf b/scripts/autoreconf
deleted file mode 100755
index 844ecd157..000000000
--- a/scripts/autoreconf
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/usr/bin/env bash
-# This file is part of the OpenADK project. OpenADK is copyrighted
-# material, please see the LICENCE file in the top-level directory.
-
-ac262=$(which autoreconf-2.62)
-ac261=$(which autoreconf-2.61)
-
-if [ ! -z "$ac262" -a -x "$ac262" ];then
-	if [ -x /usr/bin/autoreconf ];then
-		env \
-		AUTOMAKE_VERSION=1.9 \
-		AUTOCONF_VERSION=2.62 \
-			/usr/bin/autoreconf "$@"
-	else
-		env \
-		AUTOMAKE_VERSION=1.9 \
-		AUTOCONF_VERSION=2.62 \
-			/usr/local/bin/autoreconf "$@"
-	fi
-elif [ ! -z "$ac261" -a -x "$ac261" ];then
-	if [ -x /usr/bin/autoreconf ];then
-		env \
-		AUTOMAKE_VERSION=1.9 \
-		AUTOCONF_VERSION=2.61 \
-			/usr/bin/autoreconf "$@"
-	else
-		env \
-		AUTOMAKE_VERSION=1.9 \
-		AUTOCONF_VERSION=2.61 \
-			/usr/local/bin/autoreconf "$@"
-	fi
-else
-	if [ -x /usr/bin/autoreconf ];then
-		/usr/bin/autoreconf "$@"
-	else
-		/usr/local/bin/autoreconf "$@"
-	fi
-fi
diff --git a/scripts/scan-tools.sh b/scripts/scan-tools.sh
index 56b79663d..8d1fa0022 100644
--- a/scripts/scan-tools.sh
+++ b/scripts/scan-tools.sh
@@ -95,12 +95,6 @@ if [[ $X != *@(Native compiler works)* ]]; then
 fi
 rm test 2>/dev/null
 
-#if ! which cpp >/dev/null 2>&1; then
-#	echo You must install a C preprocessor to continue.
-#	echo
-#	out=1
-#fi
-
 if ! which tar >/dev/null 2>&1; then
 	echo You must install GNU tar to continue.
 	echo
@@ -220,24 +214,6 @@ if ! which wget >/dev/null 2>&1; then
 	out=1
 fi
 
-if ! which autoconf >/dev/null 2>&1; then
-	echo You must install autoconf to continue.
-	echo
-	out=1
-fi
-
-if ! which automake >/dev/null 2>&1; then
-	echo You must install automake to continue.
-	echo
-	out=1
-fi
-
-if ! which libtool >/dev/null 2>&1; then
-	echo You must install libtool to continue.
-	echo
-	out=1
-fi
-
 if ! which file >/dev/null 2>&1; then
 	echo You must install \"file\" to continue.
 	echo
diff --git a/scripts/tsort b/scripts/tsort
new file mode 100755
index 000000000..d4b176f6f
--- /dev/null
+++ b/scripts/tsort
@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+os=$(uname)
+case $os in
+	NetBSD|MirBSD|OpenBSD)
+		/usr/bin/tsort -r
+		;;
+	*)
+		/usr/bin/tsort | tac
+		;;
+esac