diff options
| author | Andrew Tridgell <tridge@samba.org> | 2010-03-23 09:32:23 -0400 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2010-04-06 20:27:01 +1000 |
| commit | 9730166fd6111160dc7925785317208f94fc677c (patch) | |
| tree | 7f279918530039df4a067d8cb8f44b87e2b47f3a /source4 | |
| parent | 014c8736e5d369dbeb5177d1f14d6d0328f4129f (diff) | |
| download | samba-9730166fd6111160dc7925785317208f94fc677c.tar.gz samba-9730166fd6111160dc7925785317208f94fc677c.tar.bz2 samba-9730166fd6111160dc7925785317208f94fc677c.zip | |
build: configure fixes for opensolaris
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/heimdal_build/wscript_configure | 6 | ||||
| -rw-r--r-- | source4/lib/tls/wscript | 7 |
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') |