TDE
/
k3b
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/k3b
0
0
Fork 0
Code Issues Releases Wiki Activity

Reactivate k3b HAL

Browse Source 
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/k3b@1258941 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
v3.5.13-sru
tpearson 13 years ago
parent 435ca112de
commit 3b978422a6
1 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File

22
libk3bdevice/configure.in.in
Unescape View File

@ -128,10 +128,10 @@ if test "x$ac_cv_use_hal" = "xyes" ; then
dbus_lib=NOTFOUND dbus_lib=NOTFOUND
dbus=NOTFOUND dbus=NOTFOUND
search_incs="$kde_includes /usr/include /usr/include/dbus-1.0 /usr/local/include /usr/local/include/dbus-1.0" search_incs="$kde_includes /usr/include /usr/include/dbus-1.0 /usr/local/include /usr/local/include/dbus-1.0 /usr/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/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/lib64/dbus-1.0/include /usr/lib/dbus-1.0/include /usr/local/lib/dbus-1.0/include /usr/lib/*/dbus-1.0/include"
AC_FIND_FILE(dbus/dbus-arch-deps.h, $search_incs_arch_deps, dbus_incdir_arch_deps) AC_FIND_FILE(dbus/dbus-arch-deps.h, $search_incs_arch_deps, dbus_incdir_arch_deps)
if [test -r $dbus_incdir/dbus/dbus.h] && [test -r $dbus_incdir_arch_deps/dbus/dbus-arch-deps.h] ; then if [test -r $dbus_incdir/dbus/dbus.h] && [test -r $dbus_incdir_arch_deps/dbus/dbus-arch-deps.h] ; then
@ -139,7 +139,7 @@ if test "x$ac_cv_use_hal" = "xyes" ; then
dbus_inc=FOUND dbus_inc=FOUND
fi fi
search_libs="$kde_libraries /usr/lib64 /usr/lib /usr/local/lib /lib /lib64" search_libs="$kde_libraries /usr/lib64 /usr/lib /usr/local/lib /lib /lib64 /lib/*/ /usr/lib/*/"
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
@ -157,9 +157,9 @@ if test "x$ac_cv_use_hal" = "xyes" ; then
AC_SUBST(DBUS_INCS) AC_SUBST(DBUS_INCS)
AC_SUBST(DBUS_LIBS) AC_SUBST(DBUS_LIBS)
########### Check for DBus-Qt bindings ########### Check for DBus-TQt bindings
AC_MSG_CHECKING(for DBus-Qt bindings) AC_MSG_CHECKING(for DBus-TQt bindings)
dbusqt_inc=NOTFOUND dbusqt_inc=NOTFOUND
dbusqt_lib=NOTFOUND dbusqt_lib=NOTFOUND
@ -169,20 +169,15 @@ if test "x$ac_cv_use_hal" = "xyes" ; then
AC_FIND_FILE(dbus/connection.h, $search_incs, dbusqt_incdir) AC_FIND_FILE(dbus/connection.h, $search_incs, dbusqt_incdir)
if test -r $dbusqt_incdir/dbus/connection.h ; then if test -r $dbusqt_incdir/dbus/connection.h ; then
have_qt_patch=0
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" DBUSQT_INCS="-I$dbusqt_incdir"
dbusqt_inc=FOUND dbusqt_inc=FOUND
fi fi
fi
search_libs="$kde_libraries /usr/lib /usr/lib64 /usr/local/lib" search_libs="$kde_libraries /usr/lib /usr/lib64 /usr/local/lib"
AC_FIND_FILE(libdbus-qt-1.so, $search_libs, dbusqt_libdir) AC_FIND_FILE(libdbus-tqt-1.so, $search_libs, dbusqt_libdir)
if test -r $dbusqt_libdir/libdbus-qt-1.so ; then if test -r $dbusqt_libdir/libdbus-tqt-1.so ; then
DBUSQT_LIBS="-L$dbusqt_libdir -ldbus-qt-1" DBUSQT_LIBS="-L$dbusqt_libdir -ldbus-tqt-1"
dbusqt_lib=FOUND dbusqt_lib=FOUND
fi fi
@ -201,6 +196,7 @@ fi
have_hal=no have_hal=no
HAL_DBUS_LIBS="" HAL_DBUS_LIBS=""
AC_MSG_RESULT(Found HAL storage version $hal_storage_version)
if [test "x$hal" = "xFOUND"] && [test "x$dbus" = "xFOUND"] && [test "x$dbusqt" = "xFOUND"] && [ test $hal_storage_version = 5 ] ; then if [test "x$hal" = "xFOUND"] && [test "x$dbus" = "xFOUND"] && [test "x$dbusqt" = "xFOUND"] && [ test $hal_storage_version = 5 ] ; then
AC_DEFINE(HAVE_HAL, , [compile in HAL support]) AC_DEFINE(HAVE_HAL, , [compile in HAL support])
have_hal=yes have_hal=yes

Write Preview
Loading…
Cancel
Save