Merge commit 'c97e30c087c5435db3861d53f89fd59576be03f6' into mm
authorMike Looijmans <milo-software@users.sourceforge.net>
Sat, 18 Dec 2010 14:27:49 +0000 (15:27 +0100)
committerMike Looijmans <milo-software@users.sourceforge.net>
Sat, 18 Dec 2010 14:27:49 +0000 (15:27 +0100)
1  2 
Makefile.am
configure.ac

diff --cc Makefile.am
Simple merge
diff --cc configure.ac
@@@ -8,18 -7,8 +8,19 @@@ TUXBOX_APPS_PKGCONFI
  AC_PROG_CC
  AC_PROG_CXX
  AC_PROG_RANLIB
+ AC_CONFIG_MACRO_DIR([m4])
  
 +AC_ARG_WITH(boxtype,
 +      [  --with-boxtype=NAME box type [[none,dm7025,dm800...]]],
 +      [BOXTYPE="$withval"],[BOXTYPE="dm800"])
 +
 +AC_SUBST(BOXTYPE)
 +AC_DEFINE_UNQUOTED(BOXTYPE,"$BOXTYPE",[box type])
 +
 +if test x"$BOXTYPE" == "xdm8000" ; then
 +      AC_DEFINE(KEY_PLAY_ACTUALLY_IS_KEY_PLAYPAUSE, 1,[define when rc sends a KEY_PLAY event for its KEY_PLAYPAUSE key])
 +fi
 +
  AC_ARG_WITH(libsdl,
        AC_HELP_STRING([--with-libsdl], [use sdl, yes or no]),
        [[withsdl=$withval]],