mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-26 15:02:50 +02:00
acinclude/configure: some minor format changes; fix indentations
Origin commit data
------------------
Branch: ni/coolstream
Commit: a43454fe0a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-12-09 (Sat, 09 Dec 2017)
Origin message was:
------------------
- acinclude/configure: some minor format changes; fix indentations
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
This commit is contained in:
69
acinclude.m4
69
acinclude.m4
@@ -1,4 +1,4 @@
|
||||
AC_DEFUN([TUXBOX_APPS],[
|
||||
AC_DEFUN([TUXBOX_APPS], [
|
||||
AM_CONFIG_HEADER(config.h)
|
||||
AM_MAINTAINER_MODE
|
||||
|
||||
@@ -30,7 +30,7 @@ AC_ARG_WITH(libcoolstream-static-dir,
|
||||
[LIBCOOLSTREAM_STATIC_DIR=""])
|
||||
|
||||
AC_ARG_ENABLE(libcoolstream-static,
|
||||
AS_HELP_STRING([--enable-libcoolstream-static], [libcoolstream static linked for testing @<:@default=no@:>@]))
|
||||
AS_HELP_STRING([--enable-libcoolstream-static], [libcoolstream static linked for testing @<:@default=no@:>@]))
|
||||
AM_CONDITIONAL(ENABLE_LIBCOOLSTREAM_STATIC, test "$enable_libcoolstream_static" = "yes")
|
||||
|
||||
AC_ARG_ENABLE(reschange,
|
||||
@@ -68,7 +68,7 @@ elif test "$TARGET" = "cdk"; then
|
||||
AC_MSG_ERROR([invalid prefix, you need to specify one in cdk mode])
|
||||
fi
|
||||
if test "$TARGET_PREFIX" != "NONE"; then
|
||||
AC_DEFINE_UNQUOTED(TARGET_PREFIX, "$TARGET_PREFIX",[The targets prefix])
|
||||
AC_DEFINE_UNQUOTED(TARGET_PREFIX, "$TARGET_PREFIX", [The targets prefix])
|
||||
fi
|
||||
if test "$TARGET_PREFIX" = "NONE"; then
|
||||
AC_MSG_ERROR([invalid targetprefix, you need to specify one in cdk mode])
|
||||
@@ -90,9 +90,8 @@ check_path() {
|
||||
])
|
||||
|
||||
dnl expand nested ${foo}/bar
|
||||
AC_DEFUN([TUXBOX_EXPAND_VARIABLE],[__$1="$2"
|
||||
AC_DEFUN([TUXBOX_EXPAND_VARIABLE], [__$1="$2"
|
||||
for __CNT in false false false false true; do dnl max 5 levels of indirection
|
||||
|
||||
$1=`eval echo "$__$1"`
|
||||
echo ${$1} | grep -q '\$' || break # 'grep -q' is POSIX, exit if no $ in variable
|
||||
__$1="${$1}"
|
||||
@@ -100,7 +99,7 @@ AC_DEFUN([TUXBOX_EXPAND_VARIABLE],[__$1="$2"
|
||||
$__CNT && AC_MSG_ERROR([can't expand variable $1=$2]) dnl bail out if we did not expand
|
||||
])
|
||||
|
||||
AC_DEFUN([TUXBOX_APPS_DIRECTORY_ONE],[
|
||||
AC_DEFUN([TUXBOX_APPS_DIRECTORY_ONE], [
|
||||
AC_ARG_WITH($1, AS_HELP_STRING([$6], [$7 [[PREFIX$4$5]]], [32], [79]), [
|
||||
_$2=$withval
|
||||
if test "$TARGET" = "cdk"; then
|
||||
@@ -109,7 +108,7 @@ AC_ARG_WITH($1, AS_HELP_STRING([$6], [$7 [[PREFIX$4$5]]], [32], [79]), [
|
||||
$2=$withval
|
||||
fi
|
||||
TARGET_$2=${$2}
|
||||
],[
|
||||
], [
|
||||
# RFC 1925: "you can always add another level of indirection..."
|
||||
TUXBOX_EXPAND_VARIABLE($2,"${$3}$5")
|
||||
if test "$TARGET" = "cdk"; then
|
||||
@@ -119,13 +118,12 @@ AC_ARG_WITH($1, AS_HELP_STRING([$6], [$7 [[PREFIX$4$5]]], [32], [79]), [
|
||||
fi
|
||||
TARGET_$2=$_$2
|
||||
])
|
||||
|
||||
dnl AC_SUBST($2)
|
||||
AC_DEFINE_UNQUOTED($2,"$_$2",$7)
|
||||
AC_SUBST(TARGET_$2)
|
||||
])
|
||||
|
||||
AC_DEFUN([TUXBOX_APPS_DIRECTORY],[
|
||||
AC_DEFUN([TUXBOX_APPS_DIRECTORY], [
|
||||
AC_REQUIRE([TUXBOX_APPS])
|
||||
|
||||
if test "$TARGET" = "cdk"; then
|
||||
@@ -236,7 +234,7 @@ AC_SUBST(HOSTED_HTTPDDIR)
|
||||
AC_SUBST(FLAGDIR)
|
||||
dnl end workaround
|
||||
|
||||
AC_DEFUN([_TUXBOX_APPS_LIB_CONFIG],[
|
||||
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
|
||||
@@ -256,23 +254,22 @@ if test "$$1_CONFIG" != "no"; then
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
AC_SUBST($1_CFLAGS)
|
||||
AC_SUBST($1_LIBS)
|
||||
])
|
||||
|
||||
AC_DEFUN([TUXBOX_APPS_LIB_CONFIG],[
|
||||
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],[
|
||||
AC_DEFUN([TUXBOX_APPS_LIB_CONFIG_CHECK], [
|
||||
_TUXBOX_APPS_LIB_CONFIG($1,$2,WARN)
|
||||
])
|
||||
|
||||
AC_DEFUN([TUXBOX_APPS_PKGCONFIG],[
|
||||
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
|
||||
@@ -284,7 +281,7 @@ if test x"$PKG_CONFIG" = x"" ; then
|
||||
fi
|
||||
])
|
||||
|
||||
AC_DEFUN([_TUXBOX_APPS_LIB_PKGCONFIG],[
|
||||
AC_DEFUN([_TUXBOX_APPS_LIB_PKGCONFIG], [
|
||||
AC_REQUIRE([TUXBOX_APPS_PKGCONFIG])
|
||||
AC_MSG_CHECKING(for package $2)
|
||||
if $PKG_CONFIG --exists "$2" ; then
|
||||
@@ -295,23 +292,22 @@ if $PKG_CONFIG --exists "$2" ; then
|
||||
else
|
||||
AC_MSG_RESULT(no)
|
||||
fi
|
||||
|
||||
AC_SUBST($1_CFLAGS)
|
||||
AC_SUBST($1_LIBS)
|
||||
])
|
||||
|
||||
AC_DEFUN([TUXBOX_APPS_LIB_PKGCONFIG],[
|
||||
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],[
|
||||
AC_DEFUN([TUXBOX_APPS_LIB_PKGCONFIG_CHECK], [
|
||||
_TUXBOX_APPS_LIB_PKGCONFIG($1,$2)
|
||||
])
|
||||
|
||||
AC_DEFUN([TUXBOX_BOXTYPE],[
|
||||
AC_DEFUN([TUXBOX_BOXTYPE], [
|
||||
AC_ARG_WITH(boxtype,
|
||||
AS_HELP_STRING([--with-boxtype], [valid values: tripledragon, coolstream, spark, azbox, generic, armbox]),
|
||||
[case "${withval}" in
|
||||
@@ -377,10 +373,10 @@ AM_CONDITIONAL(BOXTYPE_SPARK, test "$BOXTYPE" = "spark")
|
||||
AM_CONDITIONAL(BOXTYPE_GENERIC, test "$BOXTYPE" = "generic")
|
||||
AM_CONDITIONAL(BOXTYPE_ARMBOX, test "$BOXTYPE" = "armbox")
|
||||
|
||||
AM_CONDITIONAL(BOXMODEL_CS_HD1,test "$BOXMODEL" = "hd1")
|
||||
AM_CONDITIONAL(BOXMODEL_CS_HD2,test "$BOXMODEL" = "hd2")
|
||||
AM_CONDITIONAL(BOXMODEL_CS_HD1, test "$BOXMODEL" = "hd1")
|
||||
AM_CONDITIONAL(BOXMODEL_CS_HD2, test "$BOXMODEL" = "hd2")
|
||||
|
||||
AM_CONDITIONAL(BOXMODEL_RASPI,test "$BOXMODEL" = "raspi")
|
||||
AM_CONDITIONAL(BOXMODEL_RASPI, test "$BOXMODEL" = "raspi")
|
||||
|
||||
if test "$BOXTYPE" = "azbox"; then
|
||||
AC_DEFINE(HAVE_AZBOX_HARDWARE, 1, [building for an azbox])
|
||||
@@ -405,28 +401,31 @@ elif test "$BOXMODEL" = "hd2"; then
|
||||
elif test "$BOXMODEL" = "hd51"; then
|
||||
AC_DEFINE(ENABLE_CHANGE_OSD_RESOLUTION, 1, [enable change the osd resolution])
|
||||
elif test "$BOXMODEL" = "raspi"; then
|
||||
AC_DEFINE(BOXMODEL_RASPI, 1, [Raspberry pi])
|
||||
AC_DEFINE(BOXMODEL_RASPI, 1, [raspberry pi])
|
||||
fi
|
||||
])
|
||||
|
||||
dnl backward compatiblity
|
||||
AC_DEFUN([AC_GNU_SOURCE],
|
||||
[AH_VERBATIM([_GNU_SOURCE],
|
||||
[/* Enable GNU extensions on systems that have them. */
|
||||
AC_DEFUN([AC_GNU_SOURCE], [
|
||||
AH_VERBATIM([_GNU_SOURCE], [
|
||||
/* Enable GNU extensions on systems that have them. */
|
||||
#ifndef _GNU_SOURCE
|
||||
# undef _GNU_SOURCE
|
||||
#endif])dnl
|
||||
#endif
|
||||
])dnl
|
||||
AC_BEFORE([$0], [AC_COMPILE_IFELSE])dnl
|
||||
AC_BEFORE([$0], [AC_RUN_IFELSE])dnl
|
||||
AC_DEFINE([_GNU_SOURCE])
|
||||
])
|
||||
|
||||
AC_DEFUN([AC_PROG_EGREP],
|
||||
[AC_CACHE_CHECK([for egrep], [ac_cv_prog_egrep],
|
||||
[if echo a | (grep -E '(a|b)') >/dev/null 2>&1
|
||||
then ac_cv_prog_egrep='grep -E'
|
||||
else ac_cv_prog_egrep='egrep'
|
||||
fi])
|
||||
EGREP=$ac_cv_prog_egrep
|
||||
AC_SUBST([EGREP])
|
||||
AC_DEFUN([AC_PROG_EGREP], [
|
||||
AC_CACHE_CHECK([for egrep], [ac_cv_prog_egrep], [
|
||||
if echo a | (grep -E '(a|b)') >/dev/null 2>&1; then
|
||||
ac_cv_prog_egrep='grep -E'
|
||||
else
|
||||
ac_cv_prog_egrep='egrep'
|
||||
fi
|
||||
])
|
||||
EGREP=$ac_cv_prog_egrep
|
||||
AC_SUBST([EGREP])
|
||||
])
|
||||
|
Reference in New Issue
Block a user