summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFat-Zer <fatzer2@gmail.com>2013-07-01 22:49:39 -0500
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-07-01 22:49:39 -0500
commit02bf1e69902e8515adb145a63643cc92189f5c6e (patch)
tree984bc1415f56387b7d7caa54e0b4dd459b6df9db
parentdb67e0bb9c0b50c09790e2206d8d59b3573d7f55 (diff)
downloadtdebase-02bf1e69902e8515adb145a63643cc92189f5c6e.tar.gz
tdebase-02bf1e69902e8515adb145a63643cc92189f5c6e.zip
Fix tdeioslave build options
This resolves Bug 1557
-rw-r--r--CMakeLists.txt4
-rw-r--r--ConfigureChecks.cmake8
2 files changed, 6 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index df16178e8..e717aad37 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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 )
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
index 705f0a3a3..9971e5538 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 )