Skip to content

Support system not expecting libutil #165

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jcfr merged 2 commits into from
Nov 20, 2016
Merged

Support system not expecting libutil #165

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7660d59
ConfigureChecks: libutil is now optional. See #163
Oct 28, 2016
046ad41
ConfigureChecks: Add support for system not expecting "libutil" (e.g …
jcfr Nov 3, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 25 additions & 8 deletions cmake/ConfigureChecks.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,14 +351,31 @@ endif()
find_library(HAVE_LIBTERMCAP termcap)

set(LIBUTIL_LIBRARIES )
check_function_exists("openpty" HAVE_BUILTIN_OPENPTY)
if(HAVE_BUILTIN_OPENPTY)
# Libutil functions are builtin the environment (e.g emscripten)
set(LIBUTIL_LIBRARIES )
set(HAVE_LIBUTIL 1)
else()
find_library(HAVE_LIBUTIL util)
set(LIBUTIL_LIBRARIES ${HAVE_LIBUTIL})
set(LIBUTIL_EXPECTED 1)

if(CMAKE_SYSTEM MATCHES "VxWorks\\-7$")
set(LIBUTIL_EXPECTED 0)
set(HAVE_LIBUTIL 0)
endif()

if(LIBUTIL_EXPECTED)
check_function_exists("openpty" HAVE_BUILTIN_OPENPTY)
if(HAVE_BUILTIN_OPENPTY)
# Libutil functions are builtin the environment (e.g emscripten)
set(LIBUTIL_LIBRARIES )
set(HAVE_LIBUTIL 1)
else()
if(NOT DEFINED HAVE_LIBUTIL OR "${HAVE_LIBUTIL}" STREQUAL "")
find_library(HAVE_LIBUTIL util)
if(HAVE_LIBUTIL)
set(LIBUTIL_LIBRARIES ${HAVE_LIBUTIL})
endif()
message(STATUS "Found libutil: ${HAVE_LIBUTIL}")
endif()
endif()
if(NOT HAVE_LIBUTIL)
message(FATAL_ERROR "Could NOT find libutil (missing: HAVE_LIBUTIL)")
endif()
endif()

if(APPLE)
Expand Down