TDE
/
kmplayer
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/kmplayer
0
0
Fork 0
Code Issues Releases Wiki Activity

Fix dbus-tqt and dbus-1 checks

Browse Source 
This resolves Bug 943
(cherry picked from commit 9a053bb416)
v3.5.13-sru
Slávek Banko 12 years ago
parent a037663c62
commit 9b0ac1ced4
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File

6
configure.in
Unescape View File

@ -243,13 +243,13 @@ AC_ARG_ENABLE(nspr, [ --enable-npplayer Enables building with npp support],
if test "$buildnpp" = "yes"; then if test "$buildnpp" = "yes"; then
if test "$PKGCONFIGFOUND" = "yes" ; then if test "$PKGCONFIGFOUND" = "yes" ; then
DBUS_REQ=1.0.0 DBUS_REQ=1.0.0
PKG_CHECK_MODULES(DBUS, dbus-1 >= $DBUS_REQ, PKG_CHECK_MODULES(DBUS, [ dbus-tqt dbus-1 >= $DBUS_REQ ],
have_dbus=yes,have_dbus=no) have_dbus=yes,have_dbus=no)
if test "x$have_dbus" = "xyes"; then if test "x$have_dbus" = "xyes"; then
have_nspr=yes have_nspr=yes
AC_DEFINE(HAVE_DBUS, 1, [have DBus]) AC_DEFINE(HAVE_DBUS, 1, [have DBus])
LIBQTDBUS="`$PKG_CONFIG --libs dbus-1` -ldbus-tqt-1" LIBQTDBUS="`$PKG_CONFIG --libs dbus-tqt`"
LIBDBUS_CFLAGS="`$PKG_CONFIG --cflags dbus-1`" LIBDBUS_CFLAGS="`$PKG_CONFIG --cflags dbus-tqt`"
AC_DEFINE(HAVE_NSPR, 1, [build Netscape plugin loader]) AC_DEFINE(HAVE_NSPR, 1, [build Netscape plugin loader])
LIBNSPR_LIBS="`$PKG_CONFIG --libs gtk+-x11-2.0` `$PKG_CONFIG --libs dbus-glib-1` `$PKG_CONFIG --libs gthread-2.0`" LIBNSPR_LIBS="`$PKG_CONFIG --libs gtk+-x11-2.0` `$PKG_CONFIG --libs dbus-glib-1` `$PKG_CONFIG --libs gthread-2.0`"
LIBNSPR_CFLAGS="`$PKG_CONFIG --cflags gtk+-x11-2.0` `$PKG_CONFIG --cflags dbus-glib-1`" LIBNSPR_CFLAGS="`$PKG_CONFIG --cflags gtk+-x11-2.0` `$PKG_CONFIG --cflags dbus-glib-1`"

6
configure.in.in
Unescape View File

@ -177,13 +177,13 @@ AC_ARG_ENABLE(nspr, [ --enable-npplayer Enables building with npp support],
if test "$buildnpp" = "yes"; then if test "$buildnpp" = "yes"; then
if test "$PKGCONFIGFOUND" = "yes" ; then if test "$PKGCONFIGFOUND" = "yes" ; then
DBUS_REQ=1.0.0 DBUS_REQ=1.0.0
PKG_CHECK_MODULES(DBUS, dbus-1 >= $DBUS_REQ, PKG_CHECK_MODULES(DBUS, [dbus-tqt dbus-1 >= $DBUS_REQ],
have_dbus=yes,have_dbus=no) have_dbus=yes,have_dbus=no)
if test "x$have_dbus" = "xyes"; then if test "x$have_dbus" = "xyes"; then
have_nspr=yes have_nspr=yes
AC_DEFINE(HAVE_DBUS, 1, [have DBus]) AC_DEFINE(HAVE_DBUS, 1, [have DBus])
LIBQTDBUS="`$PKG_CONFIG --libs dbus-1` -ldbus-tqt-1" LIBQTDBUS="`$PKG_CONFIG --libs dbus-tqt`"
LIBDBUS_CFLAGS="`$PKG_CONFIG --cflags dbus-1`" LIBDBUS_CFLAGS="`$PKG_CONFIG --cflags dbus-tqt`"
AC_DEFINE(HAVE_NSPR, 1, [build Netscape plugin loader]) AC_DEFINE(HAVE_NSPR, 1, [build Netscape plugin loader])
LIBNSPR_LIBS="`$PKG_CONFIG --libs gtk+-x11-2.0` `$PKG_CONFIG --libs dbus-glib-1` `$PKG_CONFIG --libs gthread-2.0`" LIBNSPR_LIBS="`$PKG_CONFIG --libs gtk+-x11-2.0` `$PKG_CONFIG --libs dbus-glib-1` `$PKG_CONFIG --libs gthread-2.0`"
LIBNSPR_CFLAGS="`$PKG_CONFIG --cflags gtk+-x11-2.0` `$PKG_CONFIG --cflags dbus-glib-1`" LIBNSPR_CFLAGS="`$PKG_CONFIG --cflags gtk+-x11-2.0` `$PKG_CONFIG --cflags dbus-glib-1`"

Write Preview
Loading…
Cancel
Save