diff options
Diffstat (limited to 'tdeioslave')
| -rw-r--r-- | tdeioslave/media/configure.in.in | 12 | ||||
| -rw-r--r-- | tdeioslave/media/mediamanager/Makefile.am | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/tdeioslave/media/configure.in.in b/tdeioslave/media/configure.in.in index 1f66f3b37..413848b64 100644 --- a/tdeioslave/media/configure.in.in +++ b/tdeioslave/media/configure.in.in @@ -114,7 +114,7 @@ if test "x$hal_test" = "xyes" ; then grep dbus_connection_setup_with_qt_main $dbusqt_incdir/dbus/connection.h \ > /dev/null 2>&1 && have_qt_patch=1 if test $have_qt_patch = 1 ; then - DBUSQT_INCS="-I$dbusqt_incdir" + DBUSTQT_INCS="-I$dbusqt_incdir" dbusqt_inc=FOUND fi fi @@ -123,7 +123,7 @@ if test "x$hal_test" = "xyes" ; then AC_FIND_FILE(libdbus-qt-1.so, $search_libs, dbusqt_libdir) if test -r $dbusqt_libdir/libdbus-qt-1.so ; then - DBUSQT_LIBS="-L$dbusqt_libdir -ldbus-qt-1" + DBUSTQT_LIBS="-L$dbusqt_libdir -ldbus-qt-1" dbusqt_lib=FOUND fi @@ -136,7 +136,7 @@ if test "x$hal_test" = "xyes" ; then grep dbus_connection_setup_with_qt_main $dbusqt_incdir/dbus/connection.h \ > /dev/null 2>&1 && have_qt_patch=1 if test $have_qt_patch = 1 ; then - DBUSQT_INCS="-I$dbusqt_incdir" + DBUSTQT_INCS="-I$dbusqt_incdir" dbusqt_inc=FOUND fi fi @@ -145,7 +145,7 @@ if test "x$hal_test" = "xyes" ; then AC_FIND_FILE(libdbus-qt-1.so, $search_libs, dbusqt_libdir) if test -r $dbusqt_libdir/libdbus-qt-1.so ; then - DBUSQT_LIBS="-L$dbusqt_libdir -ldbus-qt-1" + DBUSTQT_LIBS="-L$dbusqt_libdir -ldbus-qt-1" dbusqt_lib=FOUND fi @@ -159,8 +159,8 @@ if test "x$hal_test" = "xyes" ; then AC_MSG_RESULT(searched but not found) fi - AC_SUBST(DBUSQT_INCS) - AC_SUBST(DBUSQT_LIBS) + AC_SUBST(DBUSTQT_INCS) + AC_SUBST(DBUSTQT_LIBS) fi ########### Check if media HAL backend sould be compiled diff --git a/tdeioslave/media/mediamanager/Makefile.am b/tdeioslave/media/mediamanager/Makefile.am index 108b4d19b..489226e8e 100644 --- a/tdeioslave/media/mediamanager/Makefile.am +++ b/tdeioslave/media/mediamanager/Makefile.am @@ -1,7 +1,7 @@ kde_module_LTLIBRARIES = kded_mediamanager.la if include_media_halbackend -HALBACKEND_INCS = $(HAL_INCS) $(DBUS_INCS) $(DBUSQT_INCS) +HALBACKEND_INCS = $(HAL_INCS) $(DBUS_INCS) $(DBUSTQT_INCS) endif METASOURCES = AUTO @@ -11,7 +11,7 @@ if include_media_halbackend HALBACKEND_LIB = libhalbackend.la libhalbackend_la_SOURCES = halbackend.cpp libhalbackend_la_LDFLAGS = -avoid-version $(all_libraries) -no-undefined -libhalbackend_la_LIBADD = $(HAL_LIBS) $(DBUS_LIBS) $(DBUSQT_LIBS) +libhalbackend_la_LIBADD = $(HAL_LIBS) $(DBUS_LIBS) $(DBUSTQT_LIBS) endif if include_media_linuxcdpolling |