Attachment 1327 Details for Bug 1557 – tioslave-fix-BUILD-option.patch

By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release.

[patch] tioslave-fix-BUILD-option.patch

tioslave-fix-BUILD-option.patch (text/plain), 2.17 KB, created by Alexander Golubev (Fat-Zer) on 2013-06-30 14:43:14 CDT

(hide)

Description:

Filename:

MIME Type:

Creator: Alexander Golubev (Fat-Zer)

Created: 2013-06-30 14:43:14 CDT

Size: 2.17 KB

patch

obsolete

>diff --git a/CMakeLists.txt b/CMakeLists.txt
>index 74f8686..fd1988a 100644
>--- a/CMakeLists.txt
>+++ b/CMakeLists.txt
>@@ -147,7 +147,7 @@ option( BUILD_KCONTROL "Build kcontrol" ${BUILD_ALL} )
> option( BUILD_TWIN "Build twin" ${BUILD_ALL} )
> option( BUILD_KATE "Build kate" ${BUILD_ALL} )
> option( BUILD_KONQUEROR "Build konqueror" ${BUILD_ALL} )
>-option( BUILD_KIOSLAVES "Build tdeioslaves" ${BUILD_ALL} )
>+option( BUILD_TDEIOSLAVES "Build tdeioslaves" ${BUILD_ALL} )
> option( BUILD_KICKER "Build kicker" ${BUILD_ALL} )
> option( BUILD_KDESKTOP "Build kdesktop" ${BUILD_ALL} )
> option( BUILD_KONSOLE "Build konsole" ${BUILD_ALL} )
>@@ -225,7 +225,7 @@ add_subdirectory( kcontrol )
> tde_conditional_add_subdirectory( BUILD_TWIN twin )
> tde_conditional_add_subdirectory( BUILD_KATE kate )
> tde_conditional_add_subdirectory( BUILD_KONQUEROR konqueror )
>-tde_conditional_add_subdirectory( BUILD_KIOSLAVES tdeioslave )
>+tde_conditional_add_subdirectory( BUILD_TDEIOSLAVES tdeioslave )
> tde_conditional_add_subdirectory( BUILD_KICKER kicker )
> tde_conditional_add_subdirectory( BUILD_KDESKTOP kdesktop )
> tde_conditional_add_subdirectory( BUILD_KONSOLE konsole )
>diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
>index a20b009..3769026 100644
>--- a/ConfigureChecks.cmake
>+++ b/ConfigureChecks.cmake
>@@ -12,13 +12,13 @@
> tde_setup_architecture_flags( )
> 
> # termios.h (tdm, tdeioslave)
>-if( BUILD_TDM OR BUILD_KIOSLAVES )
>+if( BUILD_TDM OR BUILD_TDEIOSLAVES )
>   check_include_file( termios.h HAVE_TERMIOS_H )
> endif( )
> 
> 
> # sys/ioctl.h (tdeioslave/fish, kcontrol/info)
>-if( BUILD_KIOSLAVES OR BUILD_KCONTROL )
>+if( BUILD_TDEIOSLAVES OR BUILD_KCONTROL )
>   check_include_file( sys/ioctl.h HAVE_SYS_IOCTL_H )
> endif( )
> 
>@@ -183,7 +183,7 @@ endif( )
> 
> 
> # kde_socklen_t
>-if( BUILD_KIOSLAVES OR BUILD_KSYSGUARD )
>+if( BUILD_TDEIOSLAVES OR BUILD_KSYSGUARD )
>   set( kde_socklen_t socklen_t )
> endif( )
> 
>@@ -260,7 +260,7 @@ endif( )
> 
> 
> # dbus-tqt (tdm, ksmserver, tdeioslaves(media))
>-if( BUILD_TDM OR BUILD_KSMSERVER OR (BUILD_KIOSLAVES AND WITH_HAL) )
>+if( BUILD_TDM OR BUILD_KSMSERVER OR (BUILD_TDEIOSLAVES AND WITH_HAL) )
> 
>   if( BUILD_KSMSERVER AND WITH_UPOWER )
>     pkg_check_modules( DBUS_1_TQT dbus-1-tqt )

Actions: View | Diff

Attachments on bug 1557: 1327