summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2015-06-14 19:22:33 (GMT)
committer Slávek Banko <slavek.banko@axis.cz>2015-06-14 19:22:33 (GMT)
commit4e9aeea22462957753950edc3ccad2549009b178 (patch)
tree49fcec0c895b322434be5f46bb5d5dc1f9692a7f
parent5e5f4837b51501b9e0b1685f96ded12a1d93c1d8 (diff)
downloadtdebase-4e9aeea2.zip
tdebase-4e9aeea2.tar.gz
Fix openpty detection with util.h and libutil.h
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
-rw-r--r--tdeioslave/fish/CMakeLists.txt2
-rw-r--r--tdeioslave/fish/ConfigureChecks.cmake32
2 files changed, 23 insertions, 11 deletions
diff --git a/tdeioslave/fish/CMakeLists.txt b/tdeioslave/fish/CMakeLists.txt
index b049813..f3fdc22 100644
--- a/tdeioslave/fish/CMakeLists.txt
+++ b/tdeioslave/fish/CMakeLists.txt
@@ -40,6 +40,6 @@ set( target tdeio_fish )
tde_add_kpart( ${target} AUTOMOC
SOURCES fish.cpp
- LINK tdeio-shared util
+ LINK tdeio-shared ${LIB_UTIL}
DESTINATION ${PLUGIN_INSTALL_DIR}
)
diff --git a/tdeioslave/fish/ConfigureChecks.cmake b/tdeioslave/fish/ConfigureChecks.cmake
index 46ea1c1..0bdc0ff 100644
--- a/tdeioslave/fish/ConfigureChecks.cmake
+++ b/tdeioslave/fish/ConfigureChecks.cmake
@@ -18,15 +18,27 @@ check_include_file( pty.h HAVE_PTY_H )
tde_save( CMAKE_REQUIRED_LIBRARIES )
set( CMAKE_REQUIRED_LIBRARIES util )
-check_c_source_runs("
- #include <pty.h>
- int main(int argc, char* argv) {
- int master_fd, slave_fd;
- int result;
- result = openpty(&master_fd, &slave_fd, 0, 0, 0);
- return 0;
- }"
- HAVE_OPENPTY
-)
+if( HAVE_PTY_H )
+ set( USE_OPENPTY_H pty.h )
+elseif( HAVE_UTIL_H )
+ set( USE_OPENPTY_H util.h )
+elseif( HAVE_LIBUTIL_H )
+ set( USE_OPENPTY_H libutil.h )
+endif( )
+if( USE_OPENPTY_H )
+ check_c_source_runs("
+ #include <${USE_OPENPTY_H}>
+ int main(int argc, char* argv[]) {
+ int master_fd, slave_fd;
+ int result;
+ result = openpty(&master_fd, &slave_fd, 0, 0, 0);
+ return 0;
+ }"
+ HAVE_OPENPTY
+ )
+endif( )
+if( HAVE_OPENPTY )
+ set( LIB_UTIL util )
+endif( )
tde_restore( CMAKE_REQUIRED_LIBRARIES )