mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-31 09:21:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into pu/fb-setmode

Browse Source 
Fix merge conflict
This commit is contained in:
M. Liebmann
2017-02-14 20:11:08 +01:00
parent 56446c358f e8ec4540ca
commit 65f81b146d
9 changed files with 40 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
acinclude.m4
View File

@@ -519,7 +519,7 @@ AC_ARG_WITH(boxmodel,
*)
AC_MSG_ERROR([unsupported value $withval for --with-boxmodel])
;;
esac], [BOXMODEL="hd1"]
esac], [test "$BOXTYPE" = "coolstream" && BOXMODEL="hd1" || true]
[if test "$BOXTYPE" = "dreambox" -o "$BOXTYPE" = "ipbox" && test -z "$BOXMODEL"; then
AC_MSG_ERROR([Dreambox/IPBox needs --with-boxmodel])
fi])