Skip to content

Commit 55a1859

Browse files
authored
Merge pull request #301 from hbiyik/arch-fixes
Arch fixes for gnutls and libzvbi
2 parents efc4438 + fbc0a4e commit 55a1859

2 files changed

Lines changed: 55 additions & 0 deletions

File tree

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
diff --git a/configure b/configure
2+
index e7bb291..a621557 100644
3+
--- a/configure
4+
+++ b/configure
5+
@@ -12611,7 +12611,7 @@
6+
printf "%s\n" "#define HAVE_LIBNETTLE 1" >>confdefs.h
7+
8+
9+
- GNUTLS_REQUIRES_PRIVATE="Requires.private: nettle, hogweed"
10+
+ GNUTLS_REQUIRES_PRIVATE="Requires.private: hogweed, nettle"
11+
12+
13+
# Check whether --with-nettle-mini was given.
Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
diff --git a/configure.ac b/configure.ac
2+
index 3737442..72760a9 100644
3+
--- a/configure.ac
4+
+++ b/configure.ac
5+
@@ -82,7 +82,7 @@
6+
inet_ntoa localtime_r memmove memset mkdir modf munmap \
7+
nl_langinfo putenv select setenv setlocale socket strcasecmp \
8+
strchr strdup strerror strncasecmp strndup strrchr strstr \
9+
- strtol strtoul tzset strptime getaddrinfo])
10+
+ strtol strtoul tzset strptime getaddrinfo sincos])
11+
12+
AM_CONDITIONAL(HAVE_STRPTIME, [test "x$HAVE_STRPTIME" = xyes])
13+
14+
@@ -103,28 +103,6 @@
15+
dnl "Noteworthy changes in autoconf version 2.66 through 2.68"
16+
dnl <https://autotools.info/forwardporting/autoconf.html>
17+
18+
-dnl sincos() is a GNU extension (a macro, not a function).
19+
-dnl If not present we use a replacement.
20+
-AC_MSG_CHECKING([for sincos])
21+
-AC_LINK_IFELSE([AC_LANG_SOURCE([
22+
-#include <stdio.h>
23+
-#include <math.h>
24+
-int main (void) {
25+
-double s, c;
26+
-/* Make sure the compiler does not optimize sincos() away
27+
- so the linker can confirm its availability. */
28+
-scanf ("%f", &s);
29+
-sincos (s, &s, &c);
30+
-printf ("%f %f", s, c);
31+
-return 0;
32+
-}
33+
-])],[
34+
- AC_MSG_RESULT([yes])
35+
- AC_DEFINE(HAVE_SINCOS, 1, [Define if the sincos() function is available])
36+
-],[
37+
- AC_MSG_RESULT([no])
38+
-])
39+
-
40+
dnl log2() is a GNU extension (a macro, not a function).
41+
dnl If not present we use a replacement.
42+
AC_MSG_CHECKING([for log2])

0 commit comments

Comments
 (0)