diff options
| author | Slávek Banko <[email protected]> | 2013-02-01 01:26:43 +0100 |
|---|---|---|
| committer | Slávek Banko <[email protected]> | 2013-02-01 01:33:39 +0100 |
| commit | 9b0ac1ced4a10896d09a2d1d82c421f5d688c9bf (patch) | |
| tree | 86aaf38d78251371e5c126f356068eacdafd868c /configure.in.in | |
| parent | a037663c6253abc4eda3b8dd2d196da98468593b (diff) | |
| download | kmplayer-9b0ac1ced4a10896d09a2d1d82c421f5d688c9bf.tar.gz kmplayer-9b0ac1ced4a10896d09a2d1d82c421f5d688c9bf.zip | |
Fix dbus-tqt and dbus-1 checks
This resolves Bug 943
(cherry picked from commit 9a053bb4167b94ac90dc9f9d46711582dbf0f689)
Diffstat (limited to 'configure.in.in')
| -rw-r--r-- | configure.in.in | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/configure.in.in b/configure.in.in index bed41ce..cc9fcf0 100644 --- a/configure.in.in +++ b/configure.in.in @@ -177,13 +177,13 @@ AC_ARG_ENABLE(nspr, [ --enable-npplayer Enables building with npp support], if test "$buildnpp" = "yes"; then if test "$PKGCONFIGFOUND" = "yes" ; then 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) if test "x$have_dbus" = "xyes"; then have_nspr=yes AC_DEFINE(HAVE_DBUS, 1, [have DBus]) - LIBQTDBUS="`$PKG_CONFIG --libs dbus-1` -ldbus-tqt-1" - LIBDBUS_CFLAGS="`$PKG_CONFIG --cflags dbus-1`" + LIBQTDBUS="`$PKG_CONFIG --libs dbus-tqt`" + LIBDBUS_CFLAGS="`$PKG_CONFIG --cflags dbus-tqt`" 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_CFLAGS="`$PKG_CONFIG --cflags gtk+-x11-2.0` `$PKG_CONFIG --cflags dbus-glib-1`" |