- acinclude/configure: some minor format changes; fix indentations

Signed-off-by: Thilo Graf <dbt@novatux.de>

acinclude.m4

@@ -92,7 +92,6 @@ check_path() {
 dnl expand nested ${foo}/bar
 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}"
@@ -119,7 +118,6 @@ 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)
@@ -255,7 +253,6 @@ if test "$$1_CONFIG" != "no"; then
 		fi
 	fi
 fi
-
 AC_SUBST($1_CFLAGS)
 AC_SUBST($1_LIBS)
 ])
@@ -294,7 +291,6 @@ if $PKG_CONFIG --exists "$2" ; then
 else
 	AC_MSG_RESULT(no)
 fi
-
 AC_SUBST($1_CFLAGS)
 AC_SUBST($1_LIBS)
 ])
@@ -404,28 +400,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],
+AC_DEFUN([AC_GNU_SOURCE], [
-[AH_VERBATIM([_GNU_SOURCE],
+AH_VERBATIM([_GNU_SOURCE], [
-[/* Enable GNU extensions on systems that have them.  */
+/* 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_DEFUN([AC_PROG_EGREP], [
-[AC_CACHE_CHECK([for egrep], [ac_cv_prog_egrep],
+AC_CACHE_CHECK([for egrep], [ac_cv_prog_egrep], [
-   [if echo a | (grep -E '(a|b)') >/dev/null 2>&1
+if echo a | (grep -E '(a|b)') >/dev/null 2>&1; then
-    then ac_cv_prog_egrep='grep -E'
+	ac_cv_prog_egrep='grep -E'
-    else ac_cv_prog_egrep='egrep'
+else
-    fi])
+	ac_cv_prog_egrep='egrep'
+fi
+])
 EGREP=$ac_cv_prog_egrep
 AC_SUBST([EGREP])
 ])

configure.ac

@@ -40,7 +40,7 @@ AC_ARG_ENABLE(ffmpegdec,
 	AC_DEFINE(ENABLE_FFMPEGDEC, 1, [include ffmpeg decoder support]))
 AM_CONDITIONAL(ENABLE_FFMPEGDEC, test "$enable_ffmpegdec" = "yes")
 
-if test x"$enable_ffmpegdec" != xyes; then
+if test "$enable_ffmpegdec" != "yes"; then
 
 AC_ARG_WITH(tremor,
 	AS_HELP_STRING([--with-tremor], [use libvorbisidec instead of libogg/libvorbis @<:@default=no@:>@]),
@@ -131,6 +131,7 @@ TUXBOX_APPS_LIB_PKGCONFIG(PNG,libpng)
 TUXBOX_APPS_LIB_PKGCONFIG(AVFORMAT,libavformat)
 TUXBOX_APPS_LIB_PKGCONFIG(AVCODEC,libavcodec)
 TUXBOX_APPS_LIB_PKGCONFIG(AVUTIL,libavutil)
+TUXBOX_APPS_LIB_PKGCONFIG(SIGC,sigc++-2.0)
 
 if test "$BOXTYPE" = "armbox"; then
 	TUXBOX_APPS_LIB_PKGCONFIG(SWSCALE,libswscale)
@@ -147,8 +148,6 @@ if test "$BOXTYPE" = "coolstream" ||
 	AC_DEFINE(SCREENSHOT, 1, [Define to 1 if the platform supports screenshots])
 fi
 
-TUXBOX_APPS_LIB_PKGCONFIG(SIGC,sigc++-2.0)
-
 AC_ARG_ENABLE(keyboard-no-rc,
 	AS_HELP_STRING([--enable-keyboard-no-rc], [enable keyboard control, disable rc control @<:@default=no@:>@]),
 	AC_DEFINE(KEYBOARD_INSTEAD_OF_REMOTE_CONTROL, 1, [enable keyboard control, disable rc control]))
@@ -190,10 +189,10 @@ AC_ARG_ENABLE(upnp,
 	[enable_upnp="$enableval"],
 	[enable_upnp="yes"])
 
-AM_CONDITIONAL(ENABLE_UPNP, test "$enable_upnp" = "yes")
 if test "$enable_upnp" = "yes"; then
 	AC_DEFINE(ENABLE_UPNP, 1, [enable UPNP support])
 fi
+AM_CONDITIONAL(ENABLE_UPNP, test "$enable_upnp" = "yes")
 
 AC_ARG_ENABLE(extupdate,
 	AS_HELP_STRING([--enable-extupdate], [enable extended update routine @<:@default=no@:>@]),
@@ -205,7 +204,6 @@ AC_ARG_ENABLE(lua,
 	[enable_lua="$enableval"],
 	[enable_lua="yes"])
 
-AM_CONDITIONAL(ENABLE_LUA, test "$enable_lua" = "yes")
 if test "$enable_lua" = "yes"; then
 	AC_DEFINE(ENABLE_LUA, 1, [include Lua support])
 	PKG_CHECK_MODULES([LUA], [lua >= 5.2], echo "lua >= 5.2 found", [
@@ -218,6 +216,7 @@ if test "$enable_lua" = "yes"; then
 	# hack...
 	AC_DEFINE(LUA_COMPAT_5_2, 1, [does not really belong in config.h, but is needed for build with lua 5.3+])
 fi
+AM_CONDITIONAL(ENABLE_LUA, test "$enable_lua" = "yes")
 
 AC_ARG_ENABLE(cleanup,
 	AS_HELP_STRING([--enable-cleanup], [enable cleanup on exit @<:@default=no@:>@]),
@@ -247,7 +246,6 @@ AC_ARG_WITH(stb-hal-build,
 	[STB_HAL_LIB="-L$withval"],
 	[STB_HAL_LIB=""])
 
-AM_CONDITIONAL(USE_STB_HAL, test "$BOXTYPE" != "coolstream")
 if test "$BOXTYPE" != coolstream; then
 	AC_DEFINE(USE_STB_HAL, 1, [use libstb-hal])
 	if test "$STB_HAL_INC" = ""; then
@@ -255,12 +253,15 @@ if test "$BOXTYPE" != coolstream; then
 	fi
 	HWLIB_CFLAGS="-I$STB_HAL_INC"
 fi
+AM_CONDITIONAL(USE_STB_HAL, test "$BOXTYPE" != "coolstream")
 
 if test "$BOXTYPE" = "coolstream"; then
+	if test "$BOXMODEL" = "hd1"; then
 		if test -e ${srcdir}/lib/hardware/coolstream/hd1/libcoolstream/nevis_ir.h; then
 			AC_DEFINE(HAVE_COOLSTREAM_NEVIS_IR_H, 1, [Define to 1 if you have the <nevis_ir.h> header file.])
 		fi
 		HWLIB_CFLAGS='-I$(top_srcdir)/lib/hardware/coolstream/hd1/libcoolstream'
+	fi
 
 	if test "$BOXMODEL" = "hd2"; then
 		if test -e ${srcdir}/lib/hardware/coolstream/hd2/libcoolstream/cs_ir_generic.h; then
@@ -271,6 +272,7 @@ if test -e ${srcdir}/lib/hardware/coolstream/hd2/libcoolstream/cs_frontpanel.h;
 		fi
 		HWLIB_CFLAGS='-I$(top_srcdir)/lib/hardware/coolstream/hd2/libcoolstream'
 	fi
+
 	HWLIB_CFLAGS="$HWLIB_CFLAGS "'-I$(top_srcdir)/src/zapit/include/private'
 	HWLIB_CFLAGS="$HWLIB_CFLAGS "'-I$(top_srcdir)/lib/hardware/coolstream'
 fi