--- kdebase-SuSE/kryptomedia/kryptomedia.h~ 2007-05-23 18:41:20 +0400 +++ kdebase-SuSE/kryptomedia/kryptomedia.h 2007-05-23 18:41:37 +0400 @@ -34,7 +34,7 @@ #include #include -#include +#include #include #include "dialog.h" --- kdebase-SuSE/kryptomedia/Makefile.am~ 2007-01-22 15:18:04 +0300 +++ kdebase-SuSE/kryptomedia/Makefile.am 2007-05-22 16:20:25 +0400 @@ -6,9 +6,9 @@ bin_PROGRAMS = kryptomedia kryptomedia_SOURCES = decryptdialog.ui dialog.cpp kryptomedia.cpp main.cpp kryptomedia_LDFLAGS = $(KDE_RPATH) $(all_libraries) -module $(KDE_PLUGIN) -kryptomedia_LDADD = $(LIBKIO) $(LIB_KDEUI) $(DBUS_LIBS) -ldbus-qt-1 $(HAL_LIBS) +kryptomedia_LDADD = $(LIBKIO) $(LIB_KDEUI) $(DBUS_LIBS) ../kioslave/media/mediamanager/libdbusqt3.la $(HAL_LIBS) -INCLUDES = -I$(top_srcdir) $(all_includes) $(DBUS_CFLAGS) $(HAL_CFLAGS) +INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/kioslave/media/mediamanager/ $(all_includes) $(DBUS_CFLAGS) $(HAL_CFLAGS) noinst_HEADERS = kryptomedia.h dialog.h --- kdebase-SuSE/kryptomedia/configure.in.in~ 2007-01-15 13:04:04 +0300 +++ kdebase-SuSE/kryptomedia/configure.in.in 2007-05-22 16:22:18 +0400 @@ -5,20 +5,7 @@ AC_SUBST(DBUS_CFLAGS) AC_SUBST(DBUS_LIBS) # HAL -PKG_CHECK_MODULES(HAL, "hal") +PKG_CHECK_MODULES(HAL, "hal-storage") AC_SUBST(HAL_CFLAGS) AC_SUBST(HAL_LIBS) - -VERSION=0.01 -AC_SUBST(VERSION) - -# DBUS QT BINDING ### stolen from kpowersave and knetworkmanager ;) # -CPPFLAGS="$CPPFLAGS $DBUS_CFLAGS $all_includes -DDBUS_API_SUBJECT_TO_CHANGE" -AC_LANG_SAVE -AC_LANG_CPLUSPLUS -AC_CHECK_HEADER([dbus/connection.h],,[AC_MSG_ERROR([You need D-BUS/Qt3 bindings])]) -AC_CHECK_HEADER([dbus/message.h],,[AC_MSG_ERROR([You need D-BUS/Qt3 bindings])]) -CPPFLAGS=$safe_CPPFLAGS -AC_LANG_RESTORE -