Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2026-01-12 07:35:55 +01:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into m4a-feature

Browse Source
This commit is contained in:
Chris Smowton
2014-12-20 19:04:09 +00:00
parent 4704ca52c0 4c3c9bf9c4
commit aae6763f4f
109 changed files with 3865 additions and 419 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
configure.ac
View File

@@ -120,17 +120,19 @@ else
AC_SUBST(APACHE_PKG,"httpd")
AC_SUBST(APACHE_CONFIG_DIR,"/etc/httpd/conf.d")
AC_SUBST(CONSOLEHELPER_RDALSACONFIG,"/usr/bin/rdalsaconfig-root")
AC_SUBST(USERMODE_PKG,"usermode")
if test $ar_distro_major -ge 7 ; then
AC_SUBST(USERMODE_PKG,"usermode usermode-gtk")
AC_SUBST(QT3_MYSQL_PKG,"qt3-MySQL")
AC_SUBST(QT3_DEVEL_PKG,"qt3-devel")
AC_SUBST(MYSQL_PKG,"mariadb")
else
if test $ar_distro_major -ge 6 ; then
AC_SUBST(USERMODE_PKG,"usermode")
AC_SUBST(QT3_MYSQL_PKG,"qt-MySQL")
AC_SUBST(QT3_DEVEL_PKG,"qt3-devel")
AC_SUBST(MYSQL_PKG,"mysqld")
else
AC_SUBST(USERMODE_PKG,"usermode")
AC_SUBST(QT3_MYSQL_PKG,"qt-MySQL")
AC_SUBST(QT3_DEVEL_PKG,"qt-devel")
AC_SUBST(MYSQL_PKG,"mysqld")
@@ -464,8 +466,9 @@ AC_CONFIG_FILES([rivendell.spec \
web/tests/Makefile \
conf/Makefile \
docs/Makefile \
docs/tables/Makefile \
docs/examples/Makefile \
docs/man/Makefile \
docs/tables/Makefile \
debian/Makefile \
debian/patches/Makefile \
xdg/Makefile \