mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-26 23:13:00 +02:00
acinclude: remove old unused cruft
remove:
- unused boxtypes, these only give a false sense of support
- unused configure options and associated #defines in config.h
- unused confiugre check macros
Origin commit data
------------------
Branch: ni/coolstream
Commit: 216a774343
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-03-22 (Wed, 22 Mar 2017)
------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
committed by
vanhofen
vanhofen
parent
089f59cc26
commit
949306bfed
240
acinclude.m4
240
acinclude.m4
@@ -204,79 +204,6 @@ AC_SUBST(PUBLIC_HTTPDDIR)
|
||||
AC_SUBST(HOSTED_HTTPDDIR)
|
||||
dnl end workaround
|
||||
|
||||
AC_DEFUN([TUXBOX_APPS_ENDIAN],[
|
||||
AC_CHECK_HEADERS(endian.h)
|
||||
AC_C_BIGENDIAN
|
||||
])
|
||||
|
||||
AC_DEFUN([TUXBOX_APPS_DRIVER],[
|
||||
AC_ARG_WITH(driver,
|
||||
[ --with-driver=PATH path for driver sources [[NONE]]],
|
||||
[DRIVER="$withval"],[DRIVER=""])
|
||||
|
||||
if test -d "$DRIVER/include"; then
|
||||
AC_DEFINE(HAVE_DBOX2_DRIVER,1,[Define to 1 if you have the dbox2 driver sources])
|
||||
else
|
||||
AC_MSG_ERROR([can't find driver sources])
|
||||
fi
|
||||
|
||||
AC_SUBST(DRIVER)
|
||||
|
||||
CPPFLAGS="$CPPFLAGS -I$DRIVER/include"
|
||||
])
|
||||
|
||||
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="-I$DVBINCLUDES $CPPFLAGS"
|
||||
CFLAGS="-I$DVBINCLUDES $CFLAGS"
|
||||
CXXFLAGS="-I$DVBINCLUDES $CXXFLAGS"
|
||||
fi
|
||||
|
||||
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 -traditional-cpp conftest.$ac_ext") 2>&AS_MESSAGE_LOG_FD | $EGREP "^version" | sed "s,version\ ,,"`
|
||||
|
||||
AC_LANG_CONFTEST([AC_LANG_SOURCE([[
|
||||
#include <linux/dvb/version.h>
|
||||
version DVB_API_VERSION_MINOR
|
||||
]])])
|
||||
DVB_API_VERSION_MINOR=`(eval "$ac_cpp -traditional-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.$DVB_API_VERSION_MINOR])
|
||||
])
|
||||
|
||||
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
|
||||
|
||||
if test "$DVB_API_VERSION_MINOR"; then
|
||||
AC_DEFINE_UNQUOTED(HAVE_DVB_API_VERSION_MINOR,$DVB_API_VERSION_MINOR,[Define to the minor version of the dvb api])
|
||||
else
|
||||
AC_DEFINE_UNQUOTED(HAVE_DVB_API_VERSION_MINOR,0,[Define to the minor version of the dvb api])
|
||||
fi
|
||||
])
|
||||
|
||||
AC_DEFUN([TUXBOX_APPS_CAPTURE],[
|
||||
AC_CHECK_HEADER(linux/dvb/avia/avia_gt_capture.h,[
|
||||
AC_DEFINE(HAVE_OLD_CAPTURE_API,1,[Define this if you want to use the old dbox2 capture API])
|
||||
AC_MSG_NOTICE([using old demux capture API])],[
|
||||
AC_MSG_NOTICE([using v4l2 capture API])
|
||||
])
|
||||
])
|
||||
|
||||
AC_DEFUN([_TUXBOX_APPS_LIB_CONFIG],[
|
||||
AC_PATH_PROG($1_CONFIG,$2,no)
|
||||
if test "$$1_CONFIG" != "no"; then
|
||||
@@ -347,128 +274,20 @@ 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_APPS_GETTEXT],[
|
||||
AC_PATH_PROG(MSGFMT, msgfmt, no)
|
||||
AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
|
||||
AC_PATH_PROG(XGETTEXT, xgettext, no)
|
||||
AC_PATH_PROG(MSGMERGE, msgmerge, no)
|
||||
|
||||
AC_MSG_CHECKING([whether NLS is requested])
|
||||
AC_ARG_ENABLE(nls,
|
||||
[ --disable-nls do not use Native Language Support],
|
||||
USE_NLS=$enableval, USE_NLS=yes)
|
||||
AC_MSG_RESULT($USE_NLS)
|
||||
AC_SUBST(USE_NLS)
|
||||
|
||||
if test "$USE_NLS" = "yes"; then
|
||||
AC_CACHE_CHECK([for GNU gettext in libc], gt_cv_func_gnugettext_libc,[
|
||||
AC_TRY_LINK([
|
||||
#include <libintl.h>
|
||||
#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
|
||||
#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
|
||||
#endif
|
||||
extern int _nl_msg_cat_cntr;
|
||||
extern int *_nl_domain_bindings;
|
||||
],[
|
||||
bindtextdomain ("", "");
|
||||
return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_domain_bindings;
|
||||
], gt_cv_func_gnugettext_libc=yes, gt_cv_func_gnugettext_libc=no
|
||||
)]
|
||||
)
|
||||
|
||||
if test "$gt_cv_func_gnugettext_libc" = "yes"; then
|
||||
AC_DEFINE(ENABLE_NLS, 1, [Define to 1 if translation of program messages to the user's native language is requested.])
|
||||
gt_use_preinstalled_gnugettext=yes
|
||||
else
|
||||
USE_NLS=no
|
||||
fi
|
||||
fi
|
||||
|
||||
if test -f "$srcdir/po/LINGUAS"; then
|
||||
ALL_LINGUAS=$(sed -e "/^#/d" "$srcdir/po/LINGUAS")
|
||||
fi
|
||||
|
||||
POFILES=
|
||||
GMOFILES=
|
||||
UPDATEPOFILES=
|
||||
DUMMYPOFILES=
|
||||
for lang in $ALL_LINGUAS; do
|
||||
POFILES="$POFILES $srcdirpre$lang.po"
|
||||
GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
|
||||
UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
|
||||
DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
|
||||
done
|
||||
INST_LINGUAS=
|
||||
if test -n "$ALL_LINGUAS"; then
|
||||
for presentlang in $ALL_LINGUAS; do
|
||||
useit=no
|
||||
if test -n "$LINGUAS"; then
|
||||
desiredlanguages="$LINGUAS"
|
||||
else
|
||||
desiredlanguages="$ALL_LINGUAS"
|
||||
fi
|
||||
for desiredlang in $desiredlanguages; do
|
||||
case "$desiredlang" in
|
||||
"$presentlang"*) useit=yes;;
|
||||
esac
|
||||
done
|
||||
if test $useit = yes; then
|
||||
INST_LINGUAS="$INST_LINGUAS $presentlang"
|
||||
fi
|
||||
done
|
||||
fi
|
||||
CATALOGS=
|
||||
if test -n "$INST_LINGUAS"; then
|
||||
for lang in $INST_LINGUAS; do
|
||||
CATALOGS="$CATALOGS $lang.gmo"
|
||||
done
|
||||
fi
|
||||
AC_SUBST(POFILES)
|
||||
AC_SUBST(GMOFILES)
|
||||
AC_SUBST(UPDATEPOFILES)
|
||||
AC_SUBST(DUMMYPOFILES)
|
||||
AC_SUBST(CATALOGS)
|
||||
])
|
||||
|
||||
AC_DEFUN([TUXBOX_BOXTYPE],[
|
||||
AC_ARG_WITH(boxtype,
|
||||
[ --with-boxtype valid values: dbox2,tripledragon,dreambox,ipbox,coolstream,generic],
|
||||
[ --with-boxtype valid values: tripledragon,coolstream,spark,azbox,generic],
|
||||
[case "${withval}" in
|
||||
dbox2|dreambox|ipbox|tripledragon|coolstream|generic)
|
||||
tripledragon|coolstream|spark|azbox|generic)
|
||||
BOXTYPE="$withval"
|
||||
;;
|
||||
dm*)
|
||||
BOXTYPE="dreambox"
|
||||
BOXMODEL="$withval"
|
||||
;;
|
||||
*)
|
||||
AC_MSG_ERROR([bad value $withval for --with-boxtype]) ;;
|
||||
esac], [BOXTYPE="coolstream"])
|
||||
|
||||
AC_ARG_WITH(boxmodel,
|
||||
[ --with-boxmodel valid for coolstream: hd1, hd2
|
||||
valid for dreambox: dm500, dm500plus, dm600pvr, dm56x0, dm7000, dm7020, dm7025
|
||||
valid for ipbox: ip200, ip250, ip350, ip400],
|
||||
valid for generic: raspi],
|
||||
[case "${withval}" in
|
||||
hd1|hd2)
|
||||
if test "$BOXTYPE" = "coolstream"; then
|
||||
@@ -489,20 +308,9 @@ AC_ARG_WITH(boxmodel,
|
||||
AC_MSG_ERROR([unknown model $withval for boxtype $BOXTYPE])
|
||||
fi
|
||||
;;
|
||||
dm500|dm500plus|dm600pvr|dm56x0|dm7000|dm7020|dm7025)
|
||||
if test "$BOXTYPE" = "dreambox"; then
|
||||
raspi)
|
||||
if test "$BOXTYPE" = "generic"; then
|
||||
BOXMODEL="$withval"
|
||||
else
|
||||
AC_MSG_ERROR([unknown model $withval for boxtype $BOXTYPE])
|
||||
fi
|
||||
;;
|
||||
ip200|ip250|ip350|ip400)
|
||||
if test "$BOXTYPE" = "ipbox"; then
|
||||
BOXMODEL="$withval"
|
||||
else
|
||||
AC_MSG_ERROR([unknown model $withval for boxtype $BOXTYPE])
|
||||
fi
|
||||
;;
|
||||
*)
|
||||
AC_MSG_ERROR([unsupported value $withval for --with-boxmodel])
|
||||
;;
|
||||
@@ -514,37 +322,25 @@ AC_ARG_WITH(boxmodel,
|
||||
AC_SUBST(BOXTYPE)
|
||||
AC_SUBST(BOXMODEL)
|
||||
|
||||
AM_CONDITIONAL(BOXTYPE_DBOX2, test "$BOXTYPE" = "dbox2")
|
||||
AM_CONDITIONAL(BOXTYPE_AZBOX, test "$BOXTYPE" = "azbox")
|
||||
AM_CONDITIONAL(BOXTYPE_TRIPLE, test "$BOXTYPE" = "tripledragon")
|
||||
AM_CONDITIONAL(BOXTYPE_DREAMBOX, test "$BOXTYPE" = "dreambox")
|
||||
AM_CONDITIONAL(BOXTYPE_IPBOX, test "$BOXTYPE" = "ipbox")
|
||||
AM_CONDITIONAL(BOXTYPE_COOL, test "$BOXTYPE" = "coolstream")
|
||||
AM_CONDITIONAL(BOXTYPE_SPARK, test "$BOXTYPE" = "spark")
|
||||
AM_CONDITIONAL(BOXTYPE_GENERIC, test "$BOXTYPE" = "generic")
|
||||
|
||||
AM_CONDITIONAL(BOXMODEL_CS_HD1,test "$BOXMODEL" = "hd1")
|
||||
AM_CONDITIONAL(BOXMODEL_CS_HD2,test "$BOXMODEL" = "hd2")
|
||||
|
||||
AM_CONDITIONAL(BOXMODEL_DM500,test "$BOXMODEL" = "dm500")
|
||||
AM_CONDITIONAL(BOXMODEL_DM500PLUS,test "$BOXMODEL" = "dm500plus")
|
||||
AM_CONDITIONAL(BOXMODEL_DM600PVR,test "$BOXMODEL" = "dm600pvr")
|
||||
AM_CONDITIONAL(BOXMODEL_DM56x0,test "$BOXMODEL" = "dm56x0")
|
||||
AM_CONDITIONAL(BOXMODEL_DM7000,test "$BOXMODEL" = "dm7000" -o "$BOXMODEL" = "dm7020" -o "$BOXMODEL" = "dm7025")
|
||||
AM_CONDITIONAL(BOXMODEL_RASPI,test "$BOXMODEL" = "raspi")
|
||||
|
||||
AM_CONDITIONAL(BOXMODEL_IP200,test "$BOXMODEL" = "ip200")
|
||||
AM_CONDITIONAL(BOXMODEL_IP250,test "$BOXMODEL" = "ip250")
|
||||
AM_CONDITIONAL(BOXMODEL_IP350,test "$BOXMODEL" = "ip350")
|
||||
AM_CONDITIONAL(BOXMODEL_IP400,test "$BOXMODEL" = "ip400")
|
||||
|
||||
if test "$BOXTYPE" = "dbox2"; then
|
||||
AC_DEFINE(HAVE_DBOX_HARDWARE, 1, [building for a dbox2])
|
||||
if test "$BOXTYPE" = "azbox"; then
|
||||
AC_DEFINE(HAVE_AZBOX_HARDWARE, 1, [building for an azbox])
|
||||
elif test "$BOXTYPE" = "tripledragon"; then
|
||||
AC_DEFINE(HAVE_TRIPLEDRAGON, 1, [building for a tripledragon])
|
||||
elif test "$BOXTYPE" = "dreambox"; then
|
||||
AC_DEFINE(HAVE_DREAMBOX_HARDWARE, 1, [building for a dreambox])
|
||||
elif test "$BOXTYPE" = "ipbox"; then
|
||||
AC_DEFINE(HAVE_IPBOX_HARDWARE, 1, [building for an ipbox])
|
||||
elif test "$BOXTYPE" = "coolstream"; then
|
||||
AC_DEFINE(HAVE_COOL_HARDWARE, 1, [building for a coolstream])
|
||||
elif test "$BOXTYPE" = "spark"; then
|
||||
AC_DEFINE(HAVE_SPARK_HARDWARE, 1, [building for a goldenmedia 990 or edision pingulux])
|
||||
elif test "$BOXTYPE" = "generic"; then
|
||||
AC_DEFINE(HAVE_GENERIC_HARDWARE, 1, [building for a generic device like a standard PC])
|
||||
fi
|
||||
@@ -554,16 +350,8 @@ if test "$BOXMODEL" = "hd1"; then
|
||||
AC_DEFINE(BOXMODEL_CS_HD1, 1, [coolstream hd1/neo/neo2/zee])
|
||||
elif test "$BOXMODEL" = "hd2"; then
|
||||
AC_DEFINE(BOXMODEL_CS_HD2, 1, [coolstream tank/trinity/trinity v2/trinity duo/zee<65>/link])
|
||||
elif test "$BOXMODEL" = "dm500"; then
|
||||
AC_DEFINE(BOXMODEL_DM500, 1, [dreambox 500])
|
||||
elif test "$BOXMODEL" = "ip200"; then
|
||||
AC_DEFINE(BOXMODEL_IP200, 1, [ipbox 200])
|
||||
elif test "$BOXMODEL" = "ip250"; then
|
||||
AC_DEFINE(BOXMODEL_IP250, 1, [ipbox 250])
|
||||
elif test "$BOXMODEL" = "ip350"; then
|
||||
AC_DEFINE(BOXMODEL_IP350, 1, [ipbox 350])
|
||||
elif test "$BOXMODEL" = "ip400"; then
|
||||
AC_DEFINE(BOXMODEL_IP400, 1, [ipbox 400])
|
||||
elif test "$BOXMODEL" = "raspi"; then
|
||||
AC_DEFINE(BOXMODEL_RASPI, 1, [Raspberry pi])
|
||||
fi
|
||||
])
|
||||
|
||||
|
||||
Reference in New Issue
Block a user