mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-26 23:13:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ni/cst-next' into ni/mp/cst-next

Browse Source 
Conflicts:
	src/system/helpers.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: fda1cda516
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-06 (Tue, 06 Sep 2016)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-09-06 15:24:30 +02:00
parent 6725075d3b 59dc4041c7
commit d083c8c3e1
23 changed files with 1035 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@@ -279,8 +279,10 @@ fi
# hack to define a short filename also for out-of-tree build
if test `dirname $0` = `pwd`; then
HWLIB_CFLAGS="$HWLIB_CFLAGS "'-D__file__=__FILE__'
HWLIB_CFLAGS="$HWLIB_CFLAGS "'-D__path_file__=__FILE__'
else
HWLIB_CFLAGS="$HWLIB_CFLAGS "'-D__file__="\"$(subst $(srcdir)/,,$(abspath $<))\""'
HWLIB_CFLAGS="$HWLIB_CFLAGS "'-D__path_file__="\"$(subst $(top_srcdir)/,,$(abspath $<))\""'
fi
#
# Check for libtdservicedb - the new one - for testing only