Fix tdeioslave build options

This resolves Bug 1557
pull/2/head
Fat-Zer 10 years ago committed by Timothy Pearson
parent db67e0bb9c
commit 02bf1e6990
  1. 4
      CMakeLists.txt
  2. 8
      ConfigureChecks.cmake

@ -145,7 +145,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} )
@ -224,7 +224,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 )

@ -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 )

Loading…
Cancel
Save