diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2013-02-01 01:26:43 +0100 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2013-02-01 01:32:15 +0100 |
| commit | 9a053bb4167b94ac90dc9f9d46711582dbf0f689 (patch) | |
| tree | 8a6f9b39f6ad25f49ae682b87782413734a550a7 | |
| parent | 5f50fb8e8a4fe4f87ea9ca16b529afcdd8ae5e62 (diff) | |
| download | kmplayer-9a053bb4.tar.gz kmplayer-9a053bb4.zip | |
Fix dbus-tqt and dbus-1 checks
This resolves Bug 943
| -rw-r--r-- | configure.in | 6 | ||||
| -rw-r--r-- | configure.in.in | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/configure.in b/configure.in index 102c19a..585bda4 100644 --- a/configure.in +++ b/configure.in @@ -243,13 +243,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`" diff --git a/configure.in.in b/configure.in.in index a2f6d68..78b4d5f 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`" |