diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | Makefile.am | 28 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | contrib/Makefile.am | 13 | ||||
| -rw-r--r-- | examples/Makefile.am | 2 | ||||
| -rw-r--r-- | examples/regiontest.c | 2 | ||||
| -rw-r--r-- | libvncclient/rfbproto.c | 4 | ||||
| -rw-r--r-- | libvncserver/Makefile.am | 42 | ||||
| -rwxr-xr-x[-rw-r--r--] | libvncserver/auth.c (renamed from auth.c) | 0 | ||||
| -rw-r--r-- | libvncserver/cargs.c (renamed from cargs.c) | 0 | ||||
| -rw-r--r-- | libvncserver/config.h | 240 | ||||
| -rwxr-xr-x[-rw-r--r--] | libvncserver/corre.c (renamed from corre.c) | 0 | ||||
| -rw-r--r-- | libvncserver/cursor.c (renamed from cursor.c) | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | libvncserver/cutpaste.c (renamed from cutpaste.c) | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | libvncserver/d3des.c (renamed from d3des.c) | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | libvncserver/d3des.h (renamed from d3des.h) | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | libvncserver/draw.c (renamed from draw.c) | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | libvncserver/font.c (renamed from font.c) | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | libvncserver/hextile.c (renamed from hextile.c) | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | libvncserver/httpd.c (renamed from httpd.c) | 6 | ||||
| -rw-r--r-- | libvncserver/main.c (renamed from main.c) | 0 | ||||
| -rw-r--r-- | libvncserver/rfbconfig.h | 243 | ||||
| -rwxr-xr-x | libvncserver/rfbregion.c (renamed from rfbregion.c) | 0 | ||||
| -rw-r--r-- | libvncserver/rfbserver.c (renamed from rfbserver.c) | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | libvncserver/rre.c (renamed from rre.c) | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | libvncserver/selbox.c (renamed from selbox.c) | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | libvncserver/sockets.c (renamed from sockets.c) | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | libvncserver/stats.c (renamed from stats.c) | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | libvncserver/tableinit24.c (renamed from tableinit24.c) | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | libvncserver/tableinitcmtemplate.c (renamed from tableinitcmtemplate.c) | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | libvncserver/tableinittctemplate.c (renamed from tableinittctemplate.c) | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | libvncserver/tabletrans24template.c (renamed from tabletrans24template.c) | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | libvncserver/tabletranstemplate.c (renamed from tabletranstemplate.c) | 0 | ||||
| -rw-r--r-- | libvncserver/tight.c (renamed from tight.c) | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | libvncserver/translate.c (renamed from translate.c) | 0 | ||||
| -rw-r--r-- | libvncserver/vncauth.c (renamed from vncauth.c) | 0 | ||||
| -rw-r--r-- | libvncserver/zlib.c (renamed from zlib.c) | 0 | ||||
| -rw-r--r-- | libvncserver/zrle.c (renamed from zrle.c) | 0 | ||||
| -rw-r--r-- | libvncserver/zrleencodetemplate.c (renamed from zrleencodetemplate.c) | 0 | ||||
| -rw-r--r-- | libvncserver/zrleoutstream.c (renamed from zrleoutstream.c) | 0 | ||||
| -rw-r--r-- | libvncserver/zrleoutstream.h (renamed from zrleoutstream.h) | 0 | ||||
| -rw-r--r-- | libvncserver/zrlepalettehelper.c (renamed from zrlepalettehelper.c) | 0 | ||||
| -rw-r--r-- | libvncserver/zrlepalettehelper.h (renamed from zrlepalettehelper.h) | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | libvncserver/zrletypes.h (renamed from zrletypes.h) | 0 | ||||
| -rw-r--r-- | test/Makefile.am | 2 | ||||
| -rw-r--r-- | vncterm/Makefile.am | 4 | ||||
| -rw-r--r-- | x11vnc/ChangeLog (renamed from contrib/ChangeLog) | 0 | ||||
| -rw-r--r-- | x11vnc/Makefile.am | 16 | ||||
| -rw-r--r-- | x11vnc/x11vnc.c (renamed from contrib/x11vnc.c) | 0 |
49 files changed, 560 insertions, 48 deletions
@@ -1,3 +1,7 @@ +2004-05-25 Johannes E. Schindelin <[email protected]> + * moved the library into libvncserver/ + * moved x11vnc into x11vnc/ + 2004-05-21 Karl Runge <[email protected]> * x11vnc: -gone, -passwdfile, -o logfile; add view-only to -accept diff --git a/Makefile.am b/Makefile.am index 359012d..d61ae3c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,7 @@ CFLAGS=-g -Wall -SUBDIRS=. examples contrib vncterm classes libvncclient test -DIST_SUBDIRS=examples contrib vncterm classes libvncclient test +SUBDIRS=libvncserver examples contrib x11vnc vncterm classes libvncclient test +DIST_SUBDIRS=libvncserver examples contrib x11vnc vncterm classes libvncclient test bin_SCRIPTS = libvncserver-config @@ -11,30 +11,6 @@ includedir=$(prefix)/include/rfb include_HEADERS=rfb/rfb.h rfb/rfbconfig.h rfb/rfbint.h rfb/rfbproto.h \ rfb/keysym.h rfb/rfbregion.h rfb/rfbclient.h -noinst_HEADERS=d3des.h rfb/default8x16.h zrleoutstream.h \ - zrlepalettehelper.h zrletypes.h - -EXTRA_DIST=tableinit24.c tableinittctemplate.c tabletranstemplate.c \ - tableinitcmtemplate.c tabletrans24template.c \ - zrleencodetemplate.c - -if HAVE_LIBZ -ZLIBSRCS = zlib.c zrle.c zrleoutstream.c zrlepalettehelper.c -if HAVE_LIBJPEG -JPEGSRCS = tight.c -endif -endif - -LIB_SRCS = main.c rfbserver.c rfbregion.c auth.c sockets.c \ - stats.c corre.c hextile.c rre.c translate.c cutpaste.c \ - httpd.c cursor.c font.c \ - draw.c selbox.c d3des.c vncauth.c cargs.c \ - $(ZLIBSRCS) $(JPEGSRCS) - -libvncserver_a_SOURCES=$(LIB_SRCS) - -lib_LIBRARIES=libvncserver.a - if HAVE_RPM $(PACKAGE)-$(VERSION).tar.gz: dist diff --git a/configure.ac b/configure.ac index 0761996..888a529 100644 --- a/configure.ac +++ b/configure.ac @@ -136,7 +136,9 @@ AC_SUBST(RPMSOURCEDIR) LDADD="-L.. -lvncserver" AC_CONFIG_FILES([Makefile + libvncserver/Makefile contrib/Makefile + x11vnc/Makefile examples/Makefile vncterm/Makefile classes/Makefile diff --git a/contrib/Makefile.am b/contrib/Makefile.am index 848b9a2..568d8b8 100644 --- a/contrib/Makefile.am +++ b/contrib/Makefile.am @@ -1,18 +1,7 @@ CFLAGS = -I .. -LDADD = ../libvncserver.a +LDADD = ../libvncserver/libvncserver.a noinst_PROGRAMS=zippy -if CYGIPC -LD_CYGIPC=-lcygipc -endif - -if HAVE_X -bin_PROGRAMS=x11vnc -x11vnc_SOURCES=x11vnc.c -INCLUDES=@X_CFLAGS@ -x11vnc_LDADD=@X_LIBS@ $(LD_CYGIPC) $(LDADD) -endif - zippy_SOURCES=zippy.c diff --git a/examples/Makefile.am b/examples/Makefile.am index 8f19836..18f3726 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -1,5 +1,5 @@ CFLAGS=-I.. -g -Wall -LDADD = ../libvncserver.a +LDADD = ../libvncserver/libvncserver.a if HAVE_LIBPTHREAD BACKGROUND_TEST=blooptest diff --git a/examples/regiontest.c b/examples/regiontest.c index 176fd26..91f1a17 100644 --- a/examples/regiontest.c +++ b/examples/regiontest.c @@ -1,3 +1,3 @@ #define SRA_TEST -#include "../rfbregion.c" +#include "../libvncserver/rfbregion.c" diff --git a/libvncclient/rfbproto.c b/libvncclient/rfbproto.c index 7ea14ae..bb2d7a4 100644 --- a/libvncclient/rfbproto.c +++ b/libvncclient/rfbproto.c @@ -1107,5 +1107,5 @@ JpegSetSrcManager(j_decompress_ptr cinfo, uint8_t *compressedData, #define usekey rfbUseKey #define cpkey rfbCPKey -#include "../vncauth.c" -#include "../d3des.c" +#include "../libvncserver/vncauth.c" +#include "../libvncserver/d3des.c" diff --git a/libvncserver/Makefile.am b/libvncserver/Makefile.am new file mode 100644 index 0000000..0a14983 --- /dev/null +++ b/libvncserver/Makefile.am @@ -0,0 +1,42 @@ +CFLAGS=-g -Wall + +includedir=$(prefix)/include/rfb +#include_HEADERS=rfb.h rfbconfig.h rfbint.h rfbproto.h keysym.h rfbregion.h + +include_HEADERS=../rfb/rfb.h ../rfb/rfbconfig.h ../rfb/rfbint.h \ + ../rfb/rfbproto.h ../rfb/keysym.h ../rfb/rfbregion.h ../rfb/rfbclient.h + +noinst_HEADERS=d3des.h ../rfb/default8x16.h zrleoutstream.h \ + zrlepalettehelper.h zrletypes.h + +EXTRA_DIST=tableinit24.c tableinittctemplate.c tabletranstemplate.c \ + tableinitcmtemplate.c tabletrans24template.c \ + zrleencodetemplate.c + +if HAVE_LIBZ +ZLIBSRCS = zlib.c zrle.c zrleoutstream.c zrlepalettehelper.c +if HAVE_LIBJPEG +JPEGSRCS = tight.c +endif +endif + +LIB_SRCS = main.c rfbserver.c rfbregion.c auth.c sockets.c \ + stats.c corre.c hextile.c rre.c translate.c cutpaste.c \ + httpd.c cursor.c font.c \ + draw.c selbox.c d3des.c vncauth.c cargs.c \ + $(ZLIBSRCS) $(JPEGSRCS) + +libvncserver_a_SOURCES=$(LIB_SRCS) + +lib_LIBRARIES=libvncserver.a + +if HAVE_RPM +$(PACKAGE)-$(VERSION).tar.gz: dist + +# Rule to build RPM distribution package +rpm: $(PACKAGE)-$(VERSION).tar.gz libvncserver.spec + cp $(PACKAGE)-$(VERSION).tar.gz @RPMSOURCEDIR@ + rpm -ba libvncserver.spec +endif + + diff --git a/auth.c b/libvncserver/auth.c index ec253dd..ec253dd 100644..100755 --- a/auth.c +++ b/libvncserver/auth.c diff --git a/cargs.c b/libvncserver/cargs.c index c26050e..c26050e 100644 --- a/cargs.c +++ b/libvncserver/cargs.c diff --git a/libvncserver/config.h b/libvncserver/config.h new file mode 100644 index 0000000..4daa20c --- /dev/null +++ b/libvncserver/config.h @@ -0,0 +1,240 @@ +/* config.h. Generated by configure. */ +/* config.h.in. Generated from configure.ac by autoheader. */ + +/* Enable 24 bit per pixel in native framebuffer */ +#define ALLOW24BPP 1 + +/* Enable BackChannel communication */ +#define BACKCHANNEL 1 + +/* Define to 1 if you have the <arpa/inet.h> header file. */ +#define HAVE_ARPA_INET_H 1 + +/* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */ +/* #undef HAVE_DOPRNT */ + +/* Define to 1 if you have the <fcntl.h> header file. */ +#define HAVE_FCNTL_H 1 + +/* Define to 1 if you have the `fork' function. */ +#define HAVE_FORK 1 + +/* Define to 1 if you have the `ftime' function. */ +#define HAVE_FTIME 1 + +/* Define to 1 if you have the `gethostbyname' function. */ +#define HAVE_GETHOSTBYNAME 1 + +/* Define to 1 if you have the `gethostname' function. */ +#define HAVE_GETHOSTNAME 1 + +/* Define to 1 if you have the `gettimeofday' function. */ +#define HAVE_GETTIMEOFDAY 1 + +/* Define to 1 if you have the `inet_ntoa' function. */ +#define HAVE_INET_NTOA 1 + +/* Define to 1 if you have the <inttypes.h> header file. */ +#define HAVE_INTTYPES_H 1 + +/* Define to 1 if you have the `cygipc' library (-lcygipc). */ +/* #undef HAVE_LIBCYGIPC */ + +/* Define to 1 if you have the `jpeg' library (-ljpeg). */ +#define HAVE_LIBJPEG 1 + +/* Define to 1 if you have the `nsl' library (-lnsl). */ +#define HAVE_LIBNSL 1 + +/* Define to 1 if you have the `pthread' library (-lpthread). */ +#define HAVE_LIBPTHREAD 1 + +/* Define to 1 if you have the `socket' library (-lsocket). */ +/* #undef HAVE_LIBSOCKET */ + +/* Define to 1 if you have the `z' library (-lz). */ +#define HAVE_LIBZ 1 + +/* Define to 1 if your system has a GNU libc compatible `malloc' function, and + to 0 otherwise. */ +#define HAVE_MALLOC 1 + +/* Define to 1 if you have the `memmove' function. */ +#define HAVE_MEMMOVE 1 + +/* Define to 1 if you have the <memory.h> header file. */ +#define HAVE_MEMORY_H 1 + +/* Define to 1 if you have the `memset' function. */ +#define HAVE_MEMSET 1 + +/* Define to 1 if you have the `mkfifo' function. */ +#define HAVE_MKFIFO 1 + +/* Define to 1 if you have the <netdb.h> header file. */ +#define HAVE_NETDB_H 1 + +/* Define to 1 if you have the <netinet/in.h> header file. */ +#define HAVE_NETINET_IN_H 1 + +/* Define to 1 if you have the `select' function. */ +#define HAVE_SELECT 1 + +/* Define to 1 if you have the `setsid' function. */ +#define HAVE_SETSID 1 + +/* Define to 1 if you have the `socket' function. */ +#define HAVE_SOCKET 1 + +/* Define to 1 if `stat' has the bug that it succeeds when given the + zero-length file name argument. */ +/* #undef HAVE_STAT_EMPTY_STRING_BUG */ + +/* Define to 1 if you have the <stdint.h> header file. */ +#define HAVE_STDINT_H 1 + +/* Define to 1 if you have the <stdlib.h> header file. */ +#define HAVE_STDLIB_H 1 + +/* Define to 1 if you have the `strchr' function. */ +#define HAVE_STRCHR 1 + +/* Define to 1 if you have the `strcspn' function. */ +#define HAVE_STRCSPN 1 + +/* Define to 1 if you have the `strdup' function. */ +#define HAVE_STRDUP 1 + +/* Define to 1 if you have the `strerror' function. */ +#define HAVE_STRERROR 1 + +/* Define to 1 if you have the `strftime' function. */ +#define HAVE_STRFTIME 1 + +/* Define to 1 if you have the <strings.h> header file. */ +#define HAVE_STRINGS_H 1 + +/* Define to 1 if you have the <string.h> header file. */ +#define HAVE_STRING_H 1 + +/* Define to 1 if you have the `strstr' function. */ +#define HAVE_STRSTR 1 + +/* Define to 1 if you have the <syslog.h> header file. */ +#define HAVE_SYSLOG_H 1 + +/* Define to 1 if you have the <sys/socket.h> header file. */ +#define HAVE_SYS_SOCKET_H 1 + +/* Define to 1 if you have the <sys/stat.h> header file. */ +#define HAVE_SYS_STAT_H 1 + +/* Define to 1 if you have the <sys/timeb.h> header file. */ +#define HAVE_SYS_TIMEB_H 1 + +/* Define to 1 if you have the <sys/time.h> header file. */ +#define HAVE_SYS_TIME_H 1 + +/* Define to 1 if you have the <sys/types.h> header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* Define to 1 if you have <sys/wait.h> that is POSIX.1 compatible. */ +#define HAVE_SYS_WAIT_H 1 + +/* Define to 1 if you have the <unistd.h> header file. */ +#define HAVE_UNISTD_H 1 + +/* Define to 1 if you have the `vfork' function. */ +#define HAVE_VFORK 1 + +/* Define to 1 if you have the <vfork.h> header file. */ +/* #undef HAVE_VFORK_H */ + +/* Define to 1 if you have the `vprintf' function. */ +#define HAVE_VPRINTF 1 + +/* Define to 1 if `fork' works. */ +#define HAVE_WORKING_FORK 1 + +/* Define to 1 if `vfork' works. */ +#define HAVE_WORKING_VFORK 1 + +/* XKEYBOARD extension build environment present */ +#define HAVE_XKEYBOARD 1 + +/* Define to 1 if `lstat' dereferences a symlink specified with a trailing + slash. */ +#define LSTAT_FOLLOWS_SLASHED_SYMLINK 1 + +/* Name of package */ +#define PACKAGE "LibVNCServer" + +/* Define to the address where bug reports for this package should be sent. */ +#define PACKAGE_BUGREPORT "http://sourceforge.net/projects/libvncserver" + +/* Define to the full name of this package. */ +#define PACKAGE_NAME "LibVNCServer" + +/* Define to the full name and version of this package. */ +#define PACKAGE_STRING "LibVNCServer 0.7pre" + +/* Define to the one symbol short name of this package. */ +#define PACKAGE_TARNAME "libvncserver" + +/* Define to the version of this package. */ +#define PACKAGE_VERSION "0.7pre" + +/* The number of bytes in type char */ +/* #undef SIZEOF_CHAR */ + +/* The number of bytes in type int */ +/* #undef SIZEOF_INT */ + +/* The number of bytes in type long */ +/* #undef SIZEOF_LONG */ + +/* The number of bytes in type short */ +/* #undef SIZEOF_SHORT */ + +/* The number of bytes in type void* */ +/* #undef SIZEOF_VOIDP */ + +/* Define to 1 if you have the ANSI C header files. */ +#define STDC_HEADERS 1 + +/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */ +#define TIME_WITH_SYS_TIME 1 + +/* Version number of package */ +#define VERSION "0.7pre" + +/* Define to 1 if your processor stores words with the most significant byte + first (like Motorola and SPARC, unlike Intel and VAX). */ +/* #undef WORDS_BIGENDIAN */ + +/* Define to 1 if the X Window System is missing or not being used. */ +/* #undef X_DISPLAY_MISSING */ + +/* Define to empty if `const' does not conform to ANSI C. */ +/* #undef const */ + +/* Define to `__inline__' or `__inline' if that's what the C compiler + calls it, or to nothing if 'inline' is not supported under any name. */ +#ifndef __cplusplus +/* #undef inline */ +#endif + +/* Define to rpl_malloc if the replacement function should be used. */ +/* #undef malloc */ + +/* Define to `int' if <sys/types.h> does not define. */ +/* #undef pid_t */ + +/* Define to `unsigned' if <sys/types.h> does not define. */ +/* #undef size_t */ + +/* The type for socklen */ +/* #undef socklen_t */ + +/* Define as `fork' if `vfork' does not work. */ +/* #undef vfork */ diff --git a/corre.c b/libvncserver/corre.c index 3f123b0..3f123b0 100644..100755 --- a/corre.c +++ b/libvncserver/corre.c diff --git a/cursor.c b/libvncserver/cursor.c index 4f290da..4f290da 100644 --- a/cursor.c +++ b/libvncserver/cursor.c diff --git a/cutpaste.c b/libvncserver/cutpaste.c index 6a9dcb9..6a9dcb9 100644..100755 --- a/cutpaste.c +++ b/libvncserver/cutpaste.c diff --git a/d3des.c b/libvncserver/d3des.c index 4994afb..4994afb 100644..100755 --- a/d3des.c +++ b/libvncserver/d3des.c diff --git a/d3des.h b/libvncserver/d3des.h index b2f9724..b2f9724 100644..100755 --- a/d3des.h +++ b/libvncserver/d3des.h diff --git a/draw.c b/libvncserver/draw.c index 7e1ed49..7e1ed49 100644..100755 --- a/draw.c +++ b/libvncserver/draw.c diff --git a/font.c b/libvncserver/font.c index 423d415..423d415 100644..100755 --- a/font.c +++ b/libvncserver/font.c diff --git a/hextile.c b/libvncserver/hextile.c index e13021b..e13021b 100644..100755 --- a/hextile.c +++ b/libvncserver/hextile.c diff --git a/httpd.c b/libvncserver/httpd.c index 25f2807..85c8e44 100644..100755 --- a/httpd.c +++ b/libvncserver/httpd.c @@ -218,7 +218,7 @@ httpProcessInput(rfbScreenInfoPtr rfbScreen) rfbBool performSubstitutions = FALSE; char str[256+32]; #ifndef WIN32 - struct passwd *user = getpwuid(getuid()); + char* user=getenv("USER"); #endif cl.sock=rfbScreen->httpSock; @@ -438,8 +438,8 @@ httpProcessInput(rfbScreenInfoPtr rfbScreen) } else if (compareAndSkip(&ptr, "$USER")) { #ifndef WIN32 if (user) { - WriteExact(&cl, user->pw_name, - strlen(user->pw_name)); + WriteExact(&cl, user, + strlen(user)); } else #endif WriteExact(&cl, "?", 1); diff --git a/main.c b/libvncserver/main.c index 488f09d..488f09d 100644 --- a/main.c +++ b/libvncserver/main.c diff --git a/libvncserver/rfbconfig.h b/libvncserver/rfbconfig.h new file mode 100644 index 0000000..888fc9b --- /dev/null +++ b/libvncserver/rfbconfig.h @@ -0,0 +1,243 @@ +/* rfbconfig.h. Generated by configure. */ +/* rfbconfig.h.in. Generated from configure.ac by autoheader. */ + +/* Enable 24 bit per pixel in native framebuffer */ +#define ALLOW24BPP 1 + +/* Enable BackChannel communication */ +#define BACKCHANNEL 1 + +/* Define to 1 if you have the <arpa/inet.h> header file. */ +#define HAVE_ARPA_INET_H 1 + +/* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */ +/* #undef HAVE_DOPRNT */ + +/* Define to 1 if you have the <fcntl.h> header file. */ +#define HAVE_FCNTL_H 1 + +/* Define to 1 if you have the `fork' function. */ +#define HAVE_FORK 1 + +/* Define to 1 if you have the `ftime' function. */ +#define HAVE_FTIME 1 + +/* Define to 1 if you have the `gethostbyname' function. */ +#define HAVE_GETHOSTBYNAME 1 + +/* Define to 1 if you have the `gethostname' function. */ +#define HAVE_GETHOSTNAME 1 + +/* Define to 1 if you have the `gettimeofday' function. */ +#define HAVE_GETTIMEOFDAY 1 + +/* Define to 1 if you have the `inet_ntoa' function. */ +#define HAVE_INET_NTOA 1 + +/* Define to 1 if you have the <inttypes.h> header file. */ +#define HAVE_INTTYPES_H 1 + +/* Define to 1 if you have the `cygipc' library (-lcygipc). */ +/* #undef HAVE_LIBCYGIPC */ + +/* Define to 1 if you have the `jpeg' library (-ljpeg). */ +#define HAVE_LIBJPEG 1 + +/* Define to 1 if you have the `nsl' library (-lnsl). */ +#define HAVE_LIBNSL 1 + +/* Define to 1 if you have the `pthread' library (-lpthread). */ +#define HAVE_LIBPTHREAD 1 + +/* Define to 1 if you have the `socket' library (-lsocket). */ +/* #undef HAVE_LIBSOCKET */ + +/* XINERAMA extension build environment present */ +#define HAVE_LIBXINERAMA 1 + +/* Define to 1 if you have the `z' library (-lz). */ +#define HAVE_LIBZ 1 + +/* Define to 1 if your system has a GNU libc compatible `malloc' function, and + to 0 otherwise. */ +#define HAVE_MALLOC 1 + +/* Define to 1 if you have the `memmove' function. */ +#define HAVE_MEMMOVE 1 + +/* Define to 1 if you have the <memory.h> header file. */ +#define HAVE_MEMORY_H 1 + +/* Define to 1 if you have the `memset' function. */ +#define HAVE_MEMSET 1 + +/* Define to 1 if you have the `mkfifo' function. */ +#define HAVE_MKFIFO 1 + +/* Define to 1 if you have the <netdb.h> header file. */ +#define HAVE_NETDB_H 1 + +/* Define to 1 if you have the <netinet/in.h> header file. */ +#define HAVE_NETINET_IN_H 1 + +/* Define to 1 if you have the `select' function. */ +#define HAVE_SELECT 1 + +/* Define to 1 if you have the `setsid' function. */ +#define HAVE_SETSID 1 + +/* Define to 1 if you have the `socket' function. */ +#define HAVE_SOCKET 1 + +/* Define to 1 if `stat' has the bug that it succeeds when given the + zero-length file name argument. */ +/* #undef HAVE_STAT_EMPTY_STRING_BUG */ + +/* Define to 1 if you have the <stdint.h> header file. */ +#define HAVE_STDINT_H 1 + +/* Define to 1 if you have the <stdlib.h> header file. */ +#define HAVE_STDLIB_H 1 + +/* Define to 1 if you have the `strchr' function. */ +#define HAVE_STRCHR 1 + +/* Define to 1 if you have the `strcspn' function. */ +#define HAVE_STRCSPN 1 + +/* Define to 1 if you have the `strdup' function. */ +#define HAVE_STRDUP 1 + +/* Define to 1 if you have the `strerror' function. */ +#define HAVE_STRERROR 1 + +/* Define to 1 if you have the `strftime' function. */ +#define HAVE_STRFTIME 1 + +/* Define to 1 if you have the <strings.h> header file. */ +#define HAVE_STRINGS_H 1 + +/* Define to 1 if you have the <string.h> header file. */ +#define HAVE_STRING_H 1 + +/* Define to 1 if you have the `strstr' function. */ +#define HAVE_STRSTR 1 + +/* Define to 1 if you have the <syslog.h> header file. */ +#define HAVE_SYSLOG_H 1 + +/* Define to 1 if you have the <sys/socket.h> header file. */ +#define HAVE_SYS_SOCKET_H 1 + +/* Define to 1 if you have the <sys/stat.h> header file. */ +#define HAVE_SYS_STAT_H 1 + +/* Define to 1 if you have the <sys/timeb.h> header file. */ +#define HAVE_SYS_TIMEB_H 1 + +/* Define to 1 if you have the <sys/time.h> header file. */ +#define HAVE_SYS_TIME_H 1 + +/* Define to 1 if you have the <sys/types.h> header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* Define to 1 if you have <sys/wait.h> that is POSIX.1 compatible. */ +#define HAVE_SYS_WAIT_H 1 + +/* Define to 1 if you have the <unistd.h> header file. */ +#define HAVE_UNISTD_H 1 + +/* Define to 1 if you have the `vfork' function. */ +#define HAVE_VFORK 1 + +/* Define to 1 if you have the <vfork.h> header file. */ +/* #undef HAVE_VFORK_H */ + +/* Define to 1 if you have the `vprintf' function. */ +#define HAVE_VPRINTF 1 + +/* Define to 1 if `fork' works. */ +#define HAVE_WORKING_FORK 1 + +/* Define to 1 if `vfork' works. */ +#define HAVE_WORKING_VFORK 1 + +/* XKEYBOARD extension build environment present */ +#define HAVE_XKEYBOARD 1 + +/* Define to 1 if `lstat' dereferences a symlink specified with a trailing + slash. */ +#define LSTAT_FOLLOWS_SLASHED_SYMLINK 1 + +/* Name of package */ +#define PACKAGE "LibVNCServer" + +/* Define to the address where bug reports for this package should be sent. */ +#define PACKAGE_BUGREPORT "http://sourceforge.net/projects/libvncserver" + +/* Define to the full name of this package. */ +#define PACKAGE_NAME "LibVNCServer" + +/* Define to the full name and version of this package. */ +#define PACKAGE_STRING "LibVNCServer 0.7pre" + +/* Define to the one symbol short name of this package. */ +#define PACKAGE_TARNAME "libvncserver" + +/* Define to the version of this package. */ +#define PACKAGE_VERSION "0.7pre" + +/* The number of bytes in type char */ +/* #undef SIZEOF_CHAR */ + +/* The number of bytes in type int */ +/* #undef SIZEOF_INT */ + +/* The number of bytes in type long */ +/* #undef SIZEOF_LONG */ + +/* The number of bytes in type short */ +/* #undef SIZEOF_SHORT */ + +/* The number of bytes in type void* */ +/* #undef SIZEOF_VOIDP */ + +/* Define to 1 if you have the ANSI C header files. */ +#define STDC_HEADERS 1 + +/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */ +#define TIME_WITH_SYS_TIME 1 + +/* Version number of package */ +#define VERSION "0.7pre" + +/* Define to 1 if your processor stores words with the most significant byte + first (like Motorola and SPARC, unlike Intel and VAX). */ +/* #undef WORDS_BIGENDIAN */ + +/* Define to 1 if the X Window System is missing or not being used. */ +/* #undef X_DISPLAY_MISSING */ + +/* Define to empty if `const' does not conform to ANSI C. */ +/* #undef const */ + +/* Define to `__inline__' or `__inline' if that's what the C compiler + calls it, or to nothing if 'inline' is not supported under any name. */ +#ifndef __cplusplus +/* #undef inline */ +#endif + +/* Define to rpl_malloc if the replacement function should be used. */ +/* #undef malloc */ + +/* Define to `int' if <sys/types.h> does not define. */ +/* #undef pid_t */ + +/* Define to `unsigned' if <sys/types.h> does not define. */ +/* #undef size_t */ + +/* The type for socklen */ +/* #undef socklen_t */ + +/* Define as `fork' if `vfork' does not work. */ +/* #undef vfork */ diff --git a/rfbregion.c b/libvncserver/rfbregion.c index a102bc2..a102bc2 100755 --- a/rfbregion.c +++ b/libvncserver/rfbregion.c diff --git a/rfbserver.c b/libvncserver/rfbserver.c index e22283e..e22283e 100644 --- a/rfbserver.c +++ b/libvncserver/rfbserver.c diff --git a/rre.c b/libvncserver/rre.c index 3e00c05..3e00c05 100644..100755 --- a/rre.c +++ b/libvncserver/rre.c diff --git a/selbox.c b/libvncserver/selbox.c index 8d76e23..8d76e23 100644..100755 --- a/selbox.c +++ b/libvncserver/selbox.c diff --git a/sockets.c b/libvncserver/sockets.c index cea1898..cea1898 100644..100755 --- a/sockets.c +++ b/libvncserver/sockets.c diff --git a/stats.c b/libvncserver/stats.c index 931c5d2..931c5d2 100644..100755 --- a/stats.c +++ b/libvncserver/stats.c diff --git a/tableinit24.c b/libvncserver/tableinit24.c index 39e9920..39e9920 100644..100755 --- a/tableinit24.c +++ b/libvncserver/tableinit24.c diff --git a/tableinitcmtemplate.c b/libvncserver/tableinitcmtemplate.c index df01b23..df01b23 100644..100755 --- a/tableinitcmtemplate.c +++ b/libvncserver/tableinitcmtemplate.c diff --git a/tableinittctemplate.c b/libvncserver/tableinittctemplate.c index 8d4f742..8d4f742 100644..100755 --- a/tableinittctemplate.c +++ b/libvncserver/tableinittctemplate.c diff --git a/tabletrans24template.c b/libvncserver/tabletrans24template.c index 4b3a0a0..4b3a0a0 100644..100755 --- a/tabletrans24template.c +++ b/libvncserver/tabletrans24template.c diff --git a/tabletranstemplate.c b/libvncserver/tabletranstemplate.c index e83c623..e83c623 100644..100755 --- a/tabletranstemplate.c +++ b/libvncserver/tabletranstemplate.c diff --git a/tight.c b/libvncserver/tight.c index b97adb9..b97adb9 100644 --- a/tight.c +++ b/libvncserver/tight.c diff --git a/translate.c b/libvncserver/translate.c index d5f0896..d5f0896 100644..100755 --- a/translate.c +++ b/libvncserver/translate.c diff --git a/vncauth.c b/libvncserver/vncauth.c index 2146e67..2146e67 100644 --- a/vncauth.c +++ b/libvncserver/vncauth.c diff --git a/zlib.c b/libvncserver/zlib.c index 9905810..9905810 100644 --- a/zlib.c +++ b/libvncserver/zlib.c diff --git a/zrle.c b/libvncserver/zrle.c index 6ab933e..6ab933e 100644 --- a/zrle.c +++ b/libvncserver/zrle.c diff --git a/zrleencodetemplate.c b/libvncserver/zrleencodetemplate.c index a1772ae..a1772ae 100644 --- a/zrleencodetemplate.c +++ b/libvncserver/zrleencodetemplate.c diff --git a/zrleoutstream.c b/libvncserver/zrleoutstream.c index d22d649..d22d649 100644 --- a/zrleoutstream.c +++ b/libvncserver/zrleoutstream.c diff --git a/zrleoutstream.h b/libvncserver/zrleoutstream.h index 9e4fe51..9e4fe51 100644 --- a/zrleoutstream.h +++ b/libvncserver/zrleoutstream.h diff --git a/zrlepalettehelper.c b/libvncserver/zrlepalettehelper.c index d758a26..d758a26 100644 --- a/zrlepalettehelper.c +++ b/libvncserver/zrlepalettehelper.c diff --git a/zrlepalettehelper.h b/libvncserver/zrlepalettehelper.h index e1213d1..e1213d1 100644 --- a/zrlepalettehelper.h +++ b/libvncserver/zrlepalettehelper.h diff --git a/zrletypes.h b/libvncserver/zrletypes.h index 0df42c9..0df42c9 100644..100755 --- a/zrletypes.h +++ b/libvncserver/zrletypes.h diff --git a/test/Makefile.am b/test/Makefile.am index c250fe6..1ca7941 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -2,5 +2,5 @@ CFLAGS=-I.. -g -Wall noinst_PROGRAMS=tight-1 cargstest -LDADD = ../libvncserver.a ../libvncclient/libvncclient.a +LDADD = ../libvncserver/libvncserver.a ../libvncclient/libvncclient.a diff --git a/vncterm/Makefile.am b/vncterm/Makefile.am index 5588b03..3a631ab 100644 --- a/vncterm/Makefile.am +++ b/vncterm/Makefile.am @@ -4,8 +4,8 @@ noinst_HEADERS=VNConsole.h vga.h CFLAGS_ADD=-I.. -LDADD=../libvncserver.a -INCLUDES=-I. -I../include +LDADD=../libvncserver/libvncserver.a +INCLUDES=-I. if LINUX bin_PROGRAMS=LinuxVNC diff --git a/contrib/ChangeLog b/x11vnc/ChangeLog index 9e468f6..9e468f6 100644 --- a/contrib/ChangeLog +++ b/x11vnc/ChangeLog diff --git a/x11vnc/Makefile.am b/x11vnc/Makefile.am new file mode 100644 index 0000000..d06d694 --- /dev/null +++ b/x11vnc/Makefile.am @@ -0,0 +1,16 @@ +CFLAGS = -I .. +LDADD = ../libvncserver/libvncserver.a + +EXTRA_DIST=ChangeLog + +if CYGIPC +LD_CYGIPC=-lcygipc +endif + +if HAVE_X +bin_PROGRAMS=x11vnc +x11vnc_SOURCES=x11vnc.c +INCLUDES=@X_CFLAGS@ +x11vnc_LDADD=@X_LIBS@ $(LD_CYGIPC) $(LDADD) +endif + diff --git a/contrib/x11vnc.c b/x11vnc/x11vnc.c index 144b280..144b280 100644 --- a/contrib/x11vnc.c +++ b/x11vnc/x11vnc.c |