Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 51259 Details for
Bug 81966
[meta-bug] Make the kde's ebuilds' USE flags really working.
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
kioslave-media-configure.in.in.patch
kioslave-media-configure.in.in.patch (text/plain), 7.24 KB, created by
Simone Gotti (RETIRED)
on 2005-02-15 04:02:31 UTC
(
hide
)
Description:
kioslave-media-configure.in.in.patch
Filename:
MIME Type:
Creator:
Simone Gotti (RETIRED)
Created:
2005-02-15 04:02:31 UTC
Size:
7.24 KB
patch
obsolete
>--- kdebase-3.3.92/kioslave/media/configure.in.in 2005-01-03 14:50:56.000000000 +0000 >+++ kdebase-3.3.92.my01/kioslave/media/configure.in.in 2005-02-14 17:53:41.000000000 +0000 >@@ -8,124 +8,130 @@ > ]) > AM_CONDITIONAL(include_media_linuxcdpolling, test "$LINUXCDPOLLING" = "yes") > >-########### Check for the HAL >- >-AC_MSG_CHECKING(for the HAL) >- >-hal_inc=NOTFOUND >-hal_lib=NOTFOUND >-hal=NOTFOUND >- >-search_incs="$kde_includes /usr/include /usr/local/include /usr/include/hal /usr/local/include/hal" >-AC_FIND_FILE(libhal.h libhal-storage.h, $search_incs, hal_incdir) >- >-if [test -r $hal_incdir/libhal.h] && [test -r $hal_incdir/libhal-storage.h] ; then >- HAL_INCS="-I$hal_incdir" >- hal_inc=FOUND >-fi >- >-search_libs="$kde_libraries /usr/lib /usr/local/lib" >-AC_FIND_FILE(libhal.so libhal-storage.so, $search_libs, hal_libdir) >- >-if [test -r $hal_libdir/libhal.so] && [test -r $hal_libdir/libhal-storage.so] ; then >- HAL_LIBS="-L$hal_libdir -lhal -lhal-storage" >- hal_lib=FOUND >-fi >- >- >-if [test $hal_inc = FOUND] && [test $hal_lib = FOUND] ; then >- AC_MSG_RESULT(headers $hal_incdir libraries $hal_libdir) >- hal=FOUND >-else >- AC_MSG_RESULT(searched but not found) >-fi >- >-AC_SUBST(HAL_INCS) >-AC_SUBST(HAL_LIBS) > >+AC_ARG_WITH(hal,AC_HELP_STRING([--with-hal],[Enable HAL support [default=check]]),[hal_test="$withval"],[hal_test="yes"]) > >+if test "x$hal_test" = "xyes" ; then >+ >+########### Check for the HAL >+ >+ AC_MSG_CHECKING(for the HAL) >+ >+ hal_inc=NOTFOUND >+ hal_lib=NOTFOUND >+ hal=NOTFOUND >+ >+ search_incs="$kde_includes /usr/include /usr/local/include /usr/include/hal /usr/local/include/hal" >+ AC_FIND_FILE(libhal.h libhal-storage.h, $search_incs, hal_incdir) >+ >+ if [test -r $hal_incdir/libhal.h] && [test -r $hal_incdir/libhal-storage.h] ; then >+ HAL_INCS="-I$hal_incdir" >+ hal_inc=FOUND >+ fi >+ >+ search_libs="$kde_libraries /usr/lib /usr/local/lib" >+ AC_FIND_FILE(libhal.so libhal-storage.so, $search_libs, hal_libdir) >+ >+ if [test -r $hal_libdir/libhal.so] && [test -r $hal_libdir/libhal-storage.so] ; then >+ HAL_LIBS="-L$hal_libdir -lhal -lhal-storage" >+ hal_lib=FOUND >+ fi >+ >+ >+ if [test $hal_inc = FOUND] && [test $hal_lib = FOUND] ; then >+ AC_MSG_RESULT(headers $hal_incdir libraries $hal_libdir) >+ hal=FOUND >+ else >+ AC_MSG_RESULT(searched but not found) >+ fi >+ >+ AC_SUBST(HAL_INCS) >+ AC_SUBST(HAL_LIBS) >+ >+ > ########### Check for DBus >- >-AC_MSG_CHECKING(for DBus) >- >-dbus_inc=NOTFOUND >-dbus_lib=NOTFOUND >-dbus=NOTFOUND >- >-search_incs="$kde_includes /usr/include /usr/local/include /usr/include/dbus-1.0 /usr/local/include/dbus-1.0" >-AC_FIND_FILE(dbus/dbus.h, $search_incs, dbus_incdir) >- >-search_incs_arch_deps="$kde_includes /usr/lib/dbus-1.0/include /usr/local/lib/dbus-1.0/include" >-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 >- DBUS_INCS="-I$dbus_incdir -I$dbus_incdir_arch_deps" >- dbus_inc=FOUND >-fi >- >-search_libs="$kde_libraries /usr/lib /usr/local/lib" >-AC_FIND_FILE(libdbus-1.so, $search_libs, dbus_libdir) >- >-if test -r $dbus_libdir/libdbus-1.so ; then >- DBUS_LIBS="-L$dbus_libdir -ldbus-1" >- dbus_lib=FOUND >-fi >- >-if [test $dbus_inc = FOUND] && [test $dbus_lib = FOUND] ; then >- AC_MSG_RESULT(headers $dbus_incdir $dbus_incdir_arch_deps libraries $dbus_libdir) >- dbus=FOUND >-else >- AC_MSG_RESULT(searched but not found) >-fi >- >-AC_SUBST(DBUS_INCS) >-AC_SUBST(DBUS_LIBS) >- >+ >+ AC_MSG_CHECKING(for DBus) >+ >+ dbus_inc=NOTFOUND >+ dbus_lib=NOTFOUND >+ dbus=NOTFOUND >+ >+ search_incs="$kde_includes /usr/include /usr/local/include /usr/include/dbus-1.0 /usr/local/include/dbus-1.0" >+ AC_FIND_FILE(dbus/dbus.h, $search_incs, dbus_incdir) >+ >+ search_incs_arch_deps="$kde_includes /usr/lib/dbus-1.0/include /usr/local/lib/dbus-1.0/include" >+ 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 >+ DBUS_INCS="-I$dbus_incdir -I$dbus_incdir_arch_deps" >+ dbus_inc=FOUND >+ fi >+ >+ search_libs="$kde_libraries /usr/lib /usr/local/lib" >+ AC_FIND_FILE(libdbus-1.so, $search_libs, dbus_libdir) >+ >+ if test -r $dbus_libdir/libdbus-1.so ; then >+ DBUS_LIBS="-L$dbus_libdir -ldbus-1" >+ dbus_lib=FOUND >+ fi >+ >+ if [test $dbus_inc = FOUND] && [test $dbus_lib = FOUND] ; then >+ AC_MSG_RESULT(headers $dbus_incdir $dbus_incdir_arch_deps libraries $dbus_libdir) >+ dbus=FOUND >+ else >+ AC_MSG_RESULT(searched but not found) >+ fi >+ >+ AC_SUBST(DBUS_INCS) >+ AC_SUBST(DBUS_LIBS) >+ > ########### Check for DBus-Qt bindings >- >-AC_MSG_CHECKING(for DBus-Qt bindings) >- >-dbusqt_inc=NOTFOUND >-dbusqt_lib=NOTFOUND >-dbusqt=NOTFOUND >- >-search_incs="$kde_includes /usr/include /usr/local/include /usr/include/dbus-1.0 /usr/local/include/dbus-1.0" >-AC_FIND_FILE(dbus/connection.h, $search_incs, dbusqt_incdir) >- >-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 \ >+ >+ AC_MSG_CHECKING(for DBus-Qt bindings) >+ >+ dbusqt_inc=NOTFOUND >+ dbusqt_lib=NOTFOUND >+ dbusqt=NOTFOUND >+ >+ search_incs="$kde_includes /usr/include /usr/local/include /usr/include/dbus-1.0 /usr/local/include/dbus-1.0" >+ AC_FIND_FILE(dbus/connection.h, $search_incs, dbusqt_incdir) >+ >+ 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_inc=FOUND >+ if test $have_qt_patch = 1 ; then >+ DBUSQT_INCS="-I$dbusqt_incdir" >+ dbusqt_inc=FOUND >+ fi >+ fi >+ >+ search_libs="$kde_libraries /usr/lib /usr/local/lib" >+ 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" >+ dbusqt_lib=FOUND >+ fi >+ >+ if [test $dbusqt_inc = FOUND] && [test $dbusqt_lib = FOUND] ; then >+ AC_MSG_RESULT(headers $dbusqt_incdir libraries $dbusqt_libdir) >+ dbusqt=FOUND >+ else >+ AC_MSG_RESULT(searched but not found) > fi >-fi >- >-search_libs="$kde_libraries /usr/lib /usr/local/lib" >-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" >- dbusqt_lib=FOUND >-fi > >-if [test $dbusqt_inc = FOUND] && [test $dbusqt_lib = FOUND] ; then >- AC_MSG_RESULT(headers $dbusqt_incdir libraries $dbusqt_libdir) >- dbusqt=FOUND >-else >- AC_MSG_RESULT(searched but not found) >+ AC_SUBST(DBUSQT_INCS) >+ AC_SUBST(DBUSQT_LIBS) > fi > >-AC_SUBST(DBUSQT_INCS) >-AC_SUBST(DBUSQT_LIBS) >- > ########### Check if media HAL backend sould be compiled > > AC_MSG_CHECKING(if the HAL backend for media:/ sould be compiled) > > HALBACKEND=no >-if [test $hal = FOUND] && [test $dbus = FOUND] && [test $dbusqt = FOUND] ; then >+if [test "x$hal" = "xFOUND"] && [test "x$dbus" = "xFOUND"] && [test "x$dbusqt" = "xFOUND"] ; then > AC_DEFINE(COMPILE_HALBACKEND, , [media HAL backend compilation]) > HALBACKEND=yes > AC_SUBST(HALBACKEND) >@@ -135,3 +141,4 @@ > fi > > AM_CONDITIONAL(include_media_halbackend, test "$HALBACKEND" = yes) >+
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 81966
: 51259 |
51260
|
51272
|
51273
|
51336