From 70863f46d9ea6ab36b25c6324674fb863dde0c65 Mon Sep 17 00:00:00 2001
From: max_10 <max_10@gmx.de>
Date: Sat, 7 Oct 2017 17:31:46 +0200
Subject: [PATCH] acinclude: remove unused TUXBOX_APPS_* stuff

---
 acinclude.m4 | 136 ---------------------------------------------------
 configure.ac |   5 +-
 2 files changed, 3 insertions(+), 138 deletions(-)

diff --git a/acinclude.m4 b/acinclude.m4
index 6f01800..18c0835 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -51,10 +51,6 @@ fi
 AC_CANONICAL_BUILD
 AC_CANONICAL_HOST
 
-check_path () {
-	return $(perl -e "if(\"$1\"=~m#^/usr/(local/)?bin#){print \"0\"}else{print \"1\";}")
-}
-
 ])
 
 dnl expand nested ${foo}/bar
@@ -139,138 +135,6 @@ AC_SUBST(PLUGINDIR)
 AC_SUBST(THEMESDIR)
 dnl end workaround
 
-AC_DEFUN([TUXBOX_APPS_ENDIAN],[
-AC_CHECK_HEADERS(endian.h)
-AC_C_BIGENDIAN
-])
-
-AC_DEFUN([TUXBOX_APPS_DVB],[
-AC_ARG_WITH(dvbincludes,
-	[  --with-dvbincludes=PATH  path for dvb includes [[NONE]]],
-	[DVBINCLUDES="$withval"],[DVBINCLUDES=""])
-
-if test "$DVBINCLUDES"; then
-	CPPFLAGS="$CPPFLAGS -I$DVBINCLUDES"
-fi
-
-if test -z "$DVB_API_VERSION"; then
-AC_CHECK_HEADERS(linux/dvb/version.h,[
-	AC_LANG_PREPROC_REQUIRE()
-	AC_REQUIRE([AC_PROG_EGREP])
-	AC_LANG_CONFTEST([AC_LANG_SOURCE([[
-#include <linux/dvb/version.h>
-version DVB_API_VERSION
-	]])])
-	DVB_API_VERSION=`(eval "$ac_cpp conftest.$ac_ext") 2>&AS_MESSAGE_LOG_FD | $EGREP "^version" | sed "s,version\ ,,"`
-	rm -f conftest*
-
-	AC_MSG_NOTICE([found dvb version $DVB_API_VERSION])
-])
-fi
-
-if test "$DVB_API_VERSION"; then
-	AC_DEFINE(HAVE_DVB,1,[Define to 1 if you have the dvb includes])
-	AC_DEFINE_UNQUOTED(HAVE_DVB_API_VERSION,$DVB_API_VERSION,[Define to the version of the dvb api])
-else
-	AC_MSG_ERROR([can't find dvb headers])
-fi
-])
-
-AC_DEFUN([_TUXBOX_APPS_LIB_CONFIG],[
-AC_PATH_PROG($1_CONFIG,$2,no)
-if test "$$1_CONFIG" != "no"; then
-	if test "$TARGET" = "cdk" && check_path "$$1_CONFIG"; then
-		AC_MSG_$3([could not find a suitable version of $2]);
-	else
-		if test "$1" = "CURL"; then
-			$1_CFLAGS=$($$1_CONFIG --cflags)
-			$1_LIBS=$($$1_CONFIG --libs)
-		else
-			if test "$1" = "FREETYPE"; then
-				$1_CFLAGS=$($$1_CONFIG --cflags)
-				$1_LIBS=$($$1_CONFIG --libs)
-			else
-				$1_CFLAGS=$($$1_CONFIG --prefix=$targetprefix --cflags)
-				$1_LIBS=$($$1_CONFIG --prefix=$targetprefix --libs)
-			fi
-		fi
-	fi
-fi
-
-AC_SUBST($1_CFLAGS)
-AC_SUBST($1_LIBS)
-])
-
-AC_DEFUN([TUXBOX_APPS_LIB_CONFIG],[
-_TUXBOX_APPS_LIB_CONFIG($1,$2,ERROR)
-if test "$$1_CONFIG" = "no"; then
-	AC_MSG_ERROR([could not find $2]);
-fi
-])
-
-AC_DEFUN([TUXBOX_APPS_LIB_CONFIG_CHECK],[
-_TUXBOX_APPS_LIB_CONFIG($1,$2,WARN)
-])
-
-AC_DEFUN([TUXBOX_APPS_PKGCONFIG],[
-m4_pattern_forbid([^_?PKG_[A-Z_]+$])
-m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
-AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
-if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
-	AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
-fi
-if test x"$PKG_CONFIG" = x"" ; then
-	AC_MSG_ERROR([could not find pkg-config]);
-fi
-])
-
-AC_DEFUN([_TUXBOX_APPS_LIB_PKGCONFIG],[
-AC_REQUIRE([TUXBOX_APPS_PKGCONFIG])
-AC_MSG_CHECKING(for package $2)
-if $PKG_CONFIG --exists "$2" ; then
-	AC_MSG_RESULT(yes)
-	$1_CFLAGS=$($PKG_CONFIG --cflags "$2")
-	$1_LIBS=$($PKG_CONFIG --libs "$2")
-	$1_EXISTS=yes
-else
-	AC_MSG_RESULT(no)
-fi
-
-AC_SUBST($1_CFLAGS)
-AC_SUBST($1_LIBS)
-])
-
-AC_DEFUN([TUXBOX_APPS_LIB_PKGCONFIG],[
-_TUXBOX_APPS_LIB_PKGCONFIG($1,$2)
-if test x"$$1_EXISTS" != xyes; then
-	AC_MSG_ERROR([could not find package $2]);
-fi
-])
-
-AC_DEFUN([TUXBOX_APPS_LIB_PKGCONFIG_CHECK],[
-_TUXBOX_APPS_LIB_PKGCONFIG($1,$2)
-])
-
-AC_DEFUN([_TUXBOX_APPS_LIB_SYMBOL],[
-AC_CHECK_LIB($2,$3,HAVE_$1="yes",HAVE_$1="no")
-if test "$HAVE_$1" = "yes"; then
-	$1_LIBS=-l$2
-fi
-
-AC_SUBST($1_LIBS)
-])
-
-AC_DEFUN([TUXBOX_APPS_LIB_SYMBOL],[
-_TUXBOX_APPS_LIB_SYMBOL($1,$2,$3,ERROR)
-if test "$HAVE_$1" = "no"; then
-	AC_MSG_ERROR([could not find $2]);
-fi
-])
-
-AC_DEFUN([TUXBOX_APPS_LIB_CONFIG_SYMBOL],[
-_TUXBOX_APPS_LIB_SYMBOL($1,$2,$3,WARN)
-])
-
 AC_DEFUN([TUXBOX_BOXTYPE],[
 AC_ARG_WITH(boxtype,
 	[  --with-boxtype          valid values: tripledragon,spark,azbox,generic,duckbox,spark7162],
diff --git a/configure.ac b/configure.ac
index 82df74a..e00d473 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,11 +6,11 @@ AC_GNU_SOURCE
 
 TUXBOX_APPS
 TUXBOX_APPS_DIRECTORY
-TUXBOX_APPS_PKGCONFIG
 TUXBOX_BOXTYPE
 
 AC_PROG_CC
 AC_PROG_CXX
+PKG_PROG_PKG_CONFIG
 ## both disabled => libtool still defaults to static
 ##                  at least the libtool I tested with ;-)
 ## --enable-shared => build only shared
@@ -21,7 +21,7 @@ AC_SYS_LARGEFILE
 AC_PROG_LIBTOOL
 
 if test x"$BOXTYPE" = x"tripledragon"; then
-	TUXBOX_APPS_LIB_PKGCONFIG(DIRECTFB, directfb)
+	PKG_CHECK_MODULES([DIRECTFB], [directfb])
 fi
 
 AC_ARG_ENABLE(gstreamer_01,
@@ -55,6 +55,7 @@ if test x$BOXTYPE = xgeneric -a x$BOXMODEL != xraspi; then
 	PKG_CHECK_MODULES([SWSCALE], [libswscale])
 	PKG_CHECK_MODULES([SWRESAMPLE], [libswresample])
 fi
+
 AC_OUTPUT([
 Makefile
 common/Makefile