diff options
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/meson.build | 2 | ||||
| -rw-r--r-- | tests/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tests/meson.build | 2 |
5 files changed, 12 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 976dfe24..dc4bfc02 100644 --- a/configure.ac +++ b/configure.ac @@ -146,8 +146,8 @@ AC_CHECK_TYPES([socklen_t], ) dnl openssl on solaris needs -lsocket -lnsl -AC_SEARCH_LIBS([socket], [socket]) -AC_SEARCH_LIBS([gethostbyname], [nsl socket]) +AC_SEARCH_LIBS([socket], [socket network]) +AC_SEARCH_LIBS([gethostbyname], [nsl socket network]) dnl On Haiku accept() and friends are in libnetwork AC_SEARCH_LIBS([accept], [network]) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index b139e364..b602330f 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -213,6 +213,8 @@ endif() check_library_exists(elftc elftc_copyfile "libelftc.h" HAVE_ELFTC_COPYFILE) if(CMAKE_SYSTEM_NAME MATCHES "SunOS") set(CMAKE_REQUIRED_LIBRARIES "socket;nsl") +elseif(CMAKE_SYSTEM_NAME MATCHES "Haiku") +set(CMAKE_REQUIRED_LIBRARIES "network") endif() check_c_source_compiles(" #include <sys/types.h> @@ -1154,6 +1156,8 @@ if(WIN32) endif() if(CMAKE_SYSTEM_NAME MATCHES "SunOS") set(SOCKLIBS socket nsl) +elseif(CMAKE_SYSTEM_NAME MATCHES "Haiku") + set(SOCKLIBS network) endif() if(SOCKLIBS) target_link_libraries(lighttpd ${SOCKLIBS}) diff --git a/src/meson.build b/src/meson.build index 713ccac7..e03a7826 100644 --- a/src/meson.build +++ b/src/meson.build @@ -27,6 +27,8 @@ if target_machine.system() == 'sunos' socket_libs = [ compiler.find_library('socket') , compiler.find_library('nsl') ] +elif target_machine.system() == 'haiku' + socket_libs = [ compiler.find_library('network') ] endif diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 444e7430..a9e83f33 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -5,6 +5,8 @@ if(WIN32) endif() if(CMAKE_SYSTEM_NAME MATCHES "SunOS") set(SOCKLIBS socket nsl) +elseif(CMAKE_SYSTEM_NAME MATCHES "Haiku") + set(SOCKLIBS network) endif() if(SOCKLIBS) target_link_libraries(fcgi-responder ${SOCKLIBS}) diff --git a/tests/meson.build b/tests/meson.build index 44355777..b1a38399 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -7,6 +7,8 @@ if target_machine.system() == 'sunos' socket_libs = [ compiler.find_library('socket') , compiler.find_library('nsl') ] +elif target_machine.system() == 'haiku' + socket_libs = [ compiler.find_library('network') ] endif executable('fcgi-responder', |