diff options
| author | Christian Beier <dontmind@freeshell.org> | 2011-10-04 17:30:36 +0200 |
|---|---|---|
| committer | Christian Beier <dontmind@freeshell.org> | 2011-10-04 17:30:36 +0200 |
| commit | bffd9ee33bd141f5c75304b1430d2ea2725239b3 (patch) | |
| tree | 0fd8ce48bd28965b623bc03c389847d11a55f3e8 /libvncserver/Makefile.am | |
| parent | 629fe03d617b2a968d30d7ed85c8f8b1e5d6a410 (diff) | |
| parent | abec0aa8c3e226682c684c9d8a0dab889815f511 (diff) | |
| download | libtdevnc-bffd9ee33bd141f5c75304b1430d2ea2725239b3.tar.gz libtdevnc-bffd9ee33bd141f5c75304b1430d2ea2725239b3.zip | |
Merge branch 'websockets'
Diffstat (limited to 'libvncserver/Makefile.am')
| -rw-r--r-- | libvncserver/Makefile.am | 28 |
1 files changed, 25 insertions, 3 deletions
diff --git a/libvncserver/Makefile.am b/libvncserver/Makefile.am index 538617f..287f1c9 100644 --- a/libvncserver/Makefile.am +++ b/libvncserver/Makefile.am @@ -12,6 +12,23 @@ TIGHTVNCFILETRANSFERSRCS = tightvnc-filetransfer/rfbtightserver.c \ tightvnc-filetransfer/filelistinfo.c endif +if WITH_WEBSOCKETS + +if HAVE_LIBSSL +WEBSOCKETSSSLSRCS = rfbssl_openssl.c rfbcrypto_openssl.c +WEBSOCKETSSSLLIBS = @SSL_LIBS@ @CRYPT_LIBS@ +else +if HAVE_GNUTLS +WEBSOCKETSSSLSRCS = rfbssl_gnutls.c rfbcrypto_gnutls.c +WEBSOCKETSSSLLIBS = @GNUTLS_LIBS@ +else +WEBSOCKETSSSLSRCS = rfbssl_none.c rfbcrypto_included.c ../common/md5.c ../common/sha1.c +endif +endif + +WEBSOCKETSSRCS = websockets.c $(WEBSOCKETSSSLSRCS) +endif + includedir=$(prefix)/include/rfb #include_HEADERS=rfb.h rfbconfig.h rfbint.h rfbproto.h keysym.h rfbregion.h @@ -29,17 +46,22 @@ EXTRA_DIST=tableinit24.c tableinittctemplate.c tabletranstemplate.c \ if HAVE_LIBZ ZLIBSRCS = zlib.c zrle.c zrleoutstream.c zrlepalettehelper.c ../common/zywrletemplate.c if HAVE_LIBJPEG -JPEGSRCS = tight.c +TIGHTSRCS = tight.c +else +if HAVE_LIBPNG +TIGHTSRCS = tight.c +endif endif endif -LIB_SRCS = main.c rfbserver.c rfbregion.c auth.c sockets.c \ +LIB_SRCS = main.c rfbserver.c rfbregion.c auth.c sockets.c $(WEBSOCKETSSRCS) \ stats.c corre.c hextile.c rre.c translate.c cutpaste.c \ httpd.c cursor.c font.c \ draw.c selbox.c ../common/d3des.c ../common/vncauth.c cargs.c ../common/minilzo.c ultra.c scale.c \ - $(ZLIBSRCS) $(JPEGSRCS) $(TIGHTVNCFILETRANSFERSRCS) + $(ZLIBSRCS) $(TIGHTSRCS) $(TIGHTVNCFILETRANSFERSRCS) libvncserver_la_SOURCES=$(LIB_SRCS) +libvncserver_la_LIBADD=$(WEBSOCKETSSSLLIBS) lib_LTLIBRARIES=libvncserver.la |