Merge branch 'tmp'

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@763 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: 982b28298a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2010-09-12 (Sun, 12 Sep 2010)



------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2010-09-12 16:13:53 +00:00
parent bf908b613a
commit 5c0cc41579
7 changed files with 131 additions and 11 deletions

View File

@@ -3,14 +3,22 @@ AM_INIT_AUTOMAKE(tuxbox-neutrino,1.0.1)
TUXBOX_APPS
TUXBOX_APPS_DIRECTORY
TUXBOX_APPS_PKGCONFIG
TUXBOX_BOXTYPE
AC_PROG_CC
AC_PROG_CXX
AC_DISABLE_STATIC
AM_PROG_LIBTOOL
TUXBOX_APPS_DVB
#TUXBOX_APPS_DRIVER
if test "$BOXTYPE" != "tripledragon"; then
echo "BOXTYPE: $BOXTYPE"
TUXBOX_APPS_DVB
if test "$BOXTYPE" != "coolstream"; then
TUXBOX_APPS_DRIVER
TUXBOX_APPS_LIB_PKGCONFIG(TUXBOX,tuxbox)
fi
fi
TUXBOX_APPS_LIB_CONFIG(CURL,curl-config)
TUXBOX_APPS_LIB_CONFIG(FREETYPE,freetype-config)
# TUXBOX_APPS_LIB_PKGCONFIG(OPENSSL,openssl)