Fix k9copy FTBFS under oneiric

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/k9copy@1258939 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
v3.5.13-sru
tpearson 13 years ago
parent 9bc08cbc21
commit e12de025a3

@ -63,7 +63,7 @@
dbus_lib=NOTFOUND dbus_lib=NOTFOUND
dbus=NOTFOUND dbus=NOTFOUND
search_incs="$kde_includes /usr/lib/i386-linux-gnu/dbus-1.0/include /usr/lib/x86_64-linux-gnu/dbus-1.0/include /usr/include /usr/include/dbus-1.0 /usr/local/include /usr/local/include/dbus-1.0" search_incs="$kde_includes /usr/lib/i386-linux-gnu/dbus-1.0/include /usr/lib/x86_64-linux-gnu/dbus-1.0/include /usr/lib/armel-linux-gnu/dbus-1.0/include /usr/include /usr/include/dbus-1.0 /usr/local/include /usr/local/include/dbus-1.0"
AC_FIND_FILE(dbus/dbus.h, $search_incs, dbus_incdir) AC_FIND_FILE(dbus/dbus.h, $search_incs, dbus_incdir)
search_incs_arch_deps="$kde_includes /usr/lib/i386-linux-gnu/dbus-1.0/include /usr/lib/x86_64-linux-gnu/dbus-1.0/include /usr/lib64/dbus-1.0/include /usr/lib/dbus-1.0/include /usr/local/lib/dbus-1.0/include" search_incs_arch_deps="$kde_includes /usr/lib/i386-linux-gnu/dbus-1.0/include /usr/lib/x86_64-linux-gnu/dbus-1.0/include /usr/lib64/dbus-1.0/include /usr/lib/dbus-1.0/include /usr/local/lib/dbus-1.0/include"
@ -74,7 +74,7 @@
dbus_inc=FOUND dbus_inc=FOUND
fi fi
search_libs="$kde_libraries /usr/lib64 /usr/lib /usr/local/lib /lib /lib64 /lib/i386-linux-gnu /lib/x86_64-linux-gnu" search_libs="$kde_libraries /usr/lib64 /usr/lib /usr/local/lib /lib /lib64 /lib/i386-linux-gnu /lib/x86_64-linux-gnu /lib/armel-linux-gnu /usr/lib/i386-linux-gnu /usr/lib/x86_64-linux-gnu /usr/lib/armel-linux-gnu"
AC_FIND_FILE(libdbus-1.so, $search_libs, dbus_libdir) AC_FIND_FILE(libdbus-1.so, $search_libs, dbus_libdir)
if test -r $dbus_libdir/libdbus-1.so ; then if test -r $dbus_libdir/libdbus-1.so ; then

@ -30,7 +30,7 @@ k9copy_SOURCES = configDlg.ui images.h k9copy.cpp k9copy.png k9glwidget.cpp \
kconfigdlg.cpp kviewmpeg2.cpp kviewmpeg2.h langselectw.ui main.cpp mencoderCmdGen.ui \ kconfigdlg.cpp kviewmpeg2.cpp kviewmpeg2.h langselectw.ui main.cpp mencoderCmdGen.ui \
playbackoptionsw.ui prefAuthor.ui prefDVD.ui prefMPEG4.ui prefMencoder.ui prefpreview.ui \ playbackoptionsw.ui prefAuthor.ui prefDVD.ui prefMPEG4.ui prefMencoder.ui prefpreview.ui \
titlefactor.ui viewmpeg2.ui titlefactor.ui viewmpeg2.ui
k9copy_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor k9copy_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor $(LIB_KPARTS)
k9copy_LDADD = $(top_builddir)/k9Mplayer/libk9mplayer.la \ k9copy_LDADD = $(top_builddir)/k9Mplayer/libk9mplayer.la \
$(top_builddir)/k9author/libk9author.la $(top_builddir)/k9decmpeg/libk9decmpeg.la \ $(top_builddir)/k9author/libk9author.la $(top_builddir)/k9decmpeg/libk9decmpeg.la \
$(top_builddir)/k9devices/libk9devices.la $(top_builddir)/k9vamps/libk9vamps.la \ $(top_builddir)/k9devices/libk9devices.la $(top_builddir)/k9vamps/libk9vamps.la \

Loading…
Cancel
Save