stv0g/tvheadend
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Some minor fixes to earlier python checks.

Browse source
This commit is contained in:
Adam Sutton 2012-08-29 21:02:11 +01:00
parent 36849d83d5
commit d0efe2998a
3 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -38,7 +38,7 @@ LDFLAGS += -lrt -ldl -lpthread
# Binaries/Scripts
#
MKBUNDLE = $(CURDIR)/support/mkbundle
MKBUNDLE = $(PYTHON) $(CURDIR)/support/mkbundle
#
# Debug/Output

11
configure vendored
View file

@ -39,7 +39,7 @@ parse_args $*
#
# Compiler
#
check_cc || die
check_cc || die 'No C compiler found'
check_cc_header execinfo
check_cc_option mmx
check_cc_option sse2
@ -47,9 +47,10 @@ check_cc_option sse2
#
# Python
#
check_py || die
check_py_import zlib pyzlib || die
check_py_import tarfile pytar || die
check_py || die 'No PYTHON binary found'
check_py_import zlib pyzlib || die "Python module missing: zlib"
check_py_import tarfile pytar || die "Python module missing: tarfile"
# Note: the above could/should be made optional
#
# SSL
@ -99,7 +100,7 @@ fi
if enabled linuxdvb && enabled dvbscan; then
if [ ! -d ${ROOTDIR}/data/dvb-scan ]; then
echo -n "Fetching dvb-scan files... "
${ROOTDIR}/support/getmuxlist &> /dev/null || die "Failed to fetch dvb-scan files (use --disable-dvbscan to skip)"
${PYTHON} ${ROOTDIR}/support/getmuxlist &> /dev/null || die "Failed to fetch dvb-scan files (use --disable-dvbscan to skip)"
echo "done"
fi
fi

10
support/configure.inc
View file

@ -183,7 +183,7 @@ function parse_args
*dir|prefix)
eval "$opt=$val"
;;
cc|arch|cpu|platform)
cc|arch|cpu|platform|python)
eval "`toupper $opt`=$val"
;;
enable-*)
@ -337,6 +337,10 @@ function print_config
echo -e " Build for arch:${TAB}${ARCH}"
echo ""
echo "Binaries:"
echo -e " Using PYTHON:${TAB}${PYTHON}"
echo ""
# Options
echo "Options:"
for opt in ${OPTIONS[*]}; do
@ -383,7 +387,9 @@ function write_config
ROOTDIR ?= ${ROOTDIR}
BUILDDIR ?= ${ROOTDIR}/build.${PLATFORM}
OSENV ?= ${OSENV}
ARCH = ${ARCH}
ARCH ?= ${ARCH}
CC ?= ${CC}
PYTHON ?= ${PYTHON}
CFLAGS += ${CFLAGS}
LDFLAGS += ${LDFLAGS}
prefix = ${prefix}