summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
Diffstat (limited to 'source4')
-rw-r--r--source4/heimdal_build/wscript_configure6
-rw-r--r--source4/lib/tls/wscript7
2 files changed, 12 insertions, 1 deletions
diff --git a/source4/heimdal_build/wscript_configure b/source4/heimdal_build/wscript_configure
index 0f28f23e55..d3a2cb7253 100644
--- a/source4/heimdal_build/wscript_configure
+++ b/source4/heimdal_build/wscript_configure
@@ -9,7 +9,7 @@ conf.CHECK_HEADERS('''crypt.h errno.h inttypes.h netdb.h signal.h sys/bswap.h
sys/utsname.h time.h timezone.h ttyname.h netinet/in.h
netinet/in6.h netinet6/in6.h libintl.h''')
-conf.CHECK_HEADERS('curses.h term.h termcap.h')
+conf.CHECK_HEADERS('curses.h term.h termcap.h', together=True)
conf.CHECK_FUNCS('''atexit cgetent getprogname setprogname gethostname
putenv rcmd readv sendmsg setitimer strlwr strncasecmp
@@ -29,6 +29,10 @@ conf.CHECK_FUNCS('bswap16')
conf.CHECK_FUNCS('bswap32')
conf.CHECK_TYPE('struct winsize', define='HAVE_STRUCT_WINSIZE', headers='sys/termios.h sys/ioctl.h')
+conf.CHECK_STRUCTURE_MEMBER('struct winsize', 'ws_xpixel',
+ define='HAVE_WS_XPIXEL', headers='sys/termios.h sys/ioctl.h')
+conf.CHECK_STRUCTURE_MEMBER('struct winsize', 'ws_ypixel',
+ define='HAVE_WS_YPIXEL', headers='sys/termios.h sys/ioctl.h')
conf.DEFINE('HAVE_KRB_STRUCT_WINSIZE', 1)
conf.DEFINE('VOID_RETSIGTYPE', 1)
diff --git a/source4/lib/tls/wscript b/source4/lib/tls/wscript
index a993848cf9..66cc762b98 100644
--- a/source4/lib/tls/wscript
+++ b/source4/lib/tls/wscript
@@ -17,6 +17,13 @@ def configure(conf):
conf.CHECK_FUNCS_IN('gnutls_global_init', 'gnutls', headers='gnutls/gnutls.h')
+ conf.CHECK_VARIABLE('gnutls_x509_crt_set_version',
+ headers='gnutls/gnutls.h gnutls/x509.h',
+ define='HAVE_GNUTLS_X509_CRT_SET_VERSION')
+ conf.CHECK_VARIABLE('gnutls_x509_crt_set_subject_key_id',
+ headers='gnutls/gnutls.h gnutls/x509.h',
+ define='HAVE_GNUTLS_X509_CRT_SET_SUBJECT_KEY_ID')
+
# check for gnutls_datum types
conf.CHECK_TYPES('gnutls_datum gnutls_datum_t', headers='gnutls/gnutls.h')