From: Arne Schwabe Date: Fri, 1 Dec 2023 12:32:11 +0000 (+0100) Subject: Remove unused/unneeded/add missing defines from configure/cmake X-Git-Tag: v2.7_alpha1~365 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=28871fec80d143b5c3c7a4083384c33f60b927e8;p=thirdparty%2Fopenvpn.git Remove unused/unneeded/add missing defines from configure/cmake Change-Id: Ifd0376b36d4050dc22bc93b8fcf7ed29faef0021 Signed-off-by: Arne Schwabe Acked-by: Frank Lichtenheld Message-Id: <20231201123211.17619-1-frank@lichtenheld.com> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg27634.html Signed-off-by: Gert Doering --- diff --git a/CMakeLists.txt b/CMakeLists.txt index d21c9bdf3..4aa979345 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -167,6 +167,7 @@ check_symbol_exists(syslog syslog.h HAVE_SYSLOG) check_symbol_exists(getgrnam grp.h HAVE_GETGRNAM) check_symbol_exists(getpwnam pwd.h HAVE_GETPWNAM) check_symbol_exists(getsockname sys/socket.h HAVE_GETSOCKNAME) +check_symbol_exists(getrlimit "sys/time.h;sys/resource.h" HAVE_GETRLIMIT) # Some OS (e.g. FreeBSD) need some basic headers to allow # including network headers diff --git a/config.h.cmake.in b/config.h.cmake.in index 19b79bc00..848c5057a 100644 --- a/config.h.cmake.in +++ b/config.h.cmake.in @@ -140,7 +140,7 @@ don't. */ #cmakedefine HAVE_GETPWNAM /* Define to 1 if you have the `getrlimit' function. */ -#undef HAVE_GETRLIMIT +#cmakedefine HAVE_GETRLIMIT /* Define to 1 if you have the `getsockname' function. */ #cmakedefine HAVE_GETSOCKNAME @@ -235,8 +235,6 @@ don't. */ /* Define to 1 if you have the header file. */ #cmakedefine HAVE_PWD_H -/* Define to 1 if you have the `readv' function. */ -#undef HAVE_READV /* Define to 1 if you have the `recvmsg' function. */ #cmakedefine HAVE_RECVMSG @@ -383,9 +381,6 @@ don't. */ /* Define to 1 if you have the header file. */ #undef HAVE_VFORK_H -/* Define to 1 if you have the `vsnprintf' function. */ -#undef HAVE_VSNPRINTF - /* we always assume a recent mbed TLS version */ #define HAVE_MBEDTLS_PSA_CRYPTO_H 1 #define HAVE_MBEDTLS_SSL_TLS_PRF 1 diff --git a/configure.ac b/configure.ac index 84eaad604..141acc6ca 100644 --- a/configure.ac +++ b/configure.ac @@ -655,7 +655,7 @@ AC_FUNC_FORK AC_CHECK_FUNCS([ \ daemon chroot getpwnam setuid nice system dup dup2 \ syslog openlog mlockall getrlimit getgrnam setgid \ - setgroups flock readv writev time gettimeofday \ + setgroups flock time gettimeofday \ setsid chdir \ chsize ftruncate execve getpeereid basename dirname access \ epoll_create strsep \