Make VPATH building work with -I $(top_srcdir) for rfb/rfb.h

ChangeLog

+2006-04-26  Karl Runge <runge@karlrunge.com>
+	* all Makefile.am: use -I $(top_srcdir) instead of -I .. so VPATH
+	  builds will work.
+	* configure.ac: create rfb subdir for rfbint.h under VPATH. 
+
 2006-04-17 Steven Carr <scarr@jsa-usa.com>
 	* Added an example camera application to demonstrate another
 	  way to write a server application.

classes/ssl/ssl_vncviewer

@@ -34,11 +34,23 @@
 # set VNCVIEWERCMD to whatever vncviewer command you want to use:
 #
 VNCVIEWERCMD=${VNCVIEWERCMD:-vncviewer}
+#
+# Same for STUNNEL, e.g. /path/to/stunnel or stunnel4, etc.
+#
 
 PATH=$PATH:/usr/sbin:/usr/local/sbin:/dist/sbin; export PATH
 
+if [ "X$STUNNEL" = "X" ]; then
+	type stunnel4 > /dev/null 2>&1
+	if [ $? = 0 ]; then
+		STUNNEL=stunnel4
+	else
+		STUNNEL=stunnel
+	fi
+fi
+
 help() {
-	head -36 $0 | tail +2
+	head -39 $0 | tail +2
 }
 
 # grab our cmdline options:
@@ -274,8 +286,8 @@ cat $tmp | uniq
 echo ""
 sleep 1
 
-echo "running: stunnel $tmp"
-stunnel $tmp < /dev/tty > /dev/tty &
+echo "running: $STUNNEL $tmp"
+$STUNNEL $tmp < /dev/tty > /dev/tty &
 pid=$!
 echo ""
 

client_examples/Makefile.am

-AM_CFLAGS=-I.. -g -Wall
+AM_CFLAGS=-I $(top_srcdir) -g -Wall
 LDADD = ../libvncclient/libvncclient.a @WSOCKLIB@
 
 if WITH_FFMPEG

configure.ac

@@ -403,6 +403,10 @@ AC_TYPE_SIZE_T
 AC_HEADER_TIME
 AC_HEADER_SYS_WAIT
 AC_TYPE_SOCKLEN_T
+if test ! -d ./rfb; then
+	echo "creating subdir ./rfb for rfbint.h"
+	mkdir ./rfb 
+fi
 AC_CREATE_STDINT_H(rfb/rfbint.h)
 AC_CACHE_CHECK([for in_addr_t],
         inaddrt, [

contrib/Makefile.am

-AM_CFLAGS = -I ..
+AM_CFLAGS = -I $(top_srcdir)
 LDADD = ../libvncserver/libvncserver.a @WSOCKLIB@
 
 noinst_PROGRAMS=zippy

examples/Makefile.am

-AM_CFLAGS=-I.. -g -Wall
+AM_CFLAGS=-I $(top_srcdir) -g -Wall
 LDADD = ../libvncserver/libvncserver.a @WSOCKLIB@
 
 if OSX

libvncclient/Makefile.am

-AM_CFLAGS=-g -I.. -I. -Wall
+AM_CFLAGS=-g -I $(top_srcdir) -I. -Wall
 
 libvncclient_a_SOURCES=cursor.c listen.c rfbproto.c sockets.c vncviewer.c
 

libvncserver/Makefile.am

-AM_CFLAGS=-g -Wall
+AM_CFLAGS=-g -Wall -I $(top_srcdir)
 
 if WITH_TIGHTVNC_FILETRANSFER
 TIGHTVNCFILETRANSFERHDRS=tightvnc-filetransfer/filelistinfo.h \

libvncserver/tightvnc-filetransfer/Makefile.am

-AM_CFLAGS=-g -Wall
+AM_CFLAGS=-g -Wall -I $(top_srcdir)
 
 includedir=$(prefix)/include/rfb
 

test/Makefile.am

-AM_CFLAGS=-I.. -g -Wall
+AM_CFLAGS=-I $(top_srcdir) -g -Wall
 LDADD = ../libvncserver/libvncserver.a ../libvncclient/libvncclient.a @WSOCKLIB@
 
 if HAVE_LIBPTHREAD

x11vnc/ChangeLog

+2006-04-26  Karl Runge <runge@karlrunge.com>
+	* x11vnc: skip exit in check_openssl() if not compiled with
+	  libssl.  set SKIP_HELP (again) in small footprint builds.
+
 2006-04-16  Karl Runge <runge@karlrunge.com>
 	* x11vnc: More web proxy work for Java SSL applet and wrapper
 	  script ssl_vncviewer.  Apache SSL gateway support for

x11vnc/Makefile.am

-AM_CFLAGS = -I ..
+AM_CFLAGS = -I $(top_srcdir)
 LDADD = ../libvncserver/libvncserver.a @WSOCKLIB@
 
 SUBDIRS = misc

x11vnc/help.c

@@ -2891,7 +2891,9 @@ void xopen_display_fail_message(char *disp) {
 	fprintf(stderr, "   by the -auth option, e.g.:\n");
 	fprintf(stderr, "       x11vnc -auth /home/someuser/.Xauthority"
 	    " -display :0\n");
-	fprintf(stderr, "   you must have read permission for that file.\n");
+	fprintf(stderr, "       x11vnc -auth /tmp/.gdmzndVlR"
+	    " -display :0\n");
+	fprintf(stderr, "   you must have read permission for the auth file.\n");
 	fprintf(stderr, "\n");
 	fprintf(stderr, " - If NO ONE is logged into an X session yet, but"
 	    " there is a greeter login\n");

x11vnc/sslhelper.c

@@ -34,8 +34,8 @@ static void badnews(void) {
 void openssl_init(void) {badnews();}
 void openssl_port(void) {badnews();}
 void https_port(void) {badnews();}
-void check_openssl(void) {badnews();}
-void check_https(void) {badnews();}
+void check_openssl(void) {if (use_openssl) badnews();}
+void check_https(void) {if (use_openssl) badnews();}
 void ssl_helper_pid(pid_t pid, int sock) {badnews(); sock = pid;}
 void accept_openssl(int mode) {mode = 0; badnews();}
 char *find_openssl_bin(void) {badnews(); return NULL;}

x11vnc/x11vnc.1

@@ -2,7 +2,7 @@
 .TH X11VNC "1" "April 2006" "x11vnc " "User Commands"
 .SH NAME
 x11vnc - allow VNC connections to real X11 displays
-         version: 0.8.1, lastmod: 2006-04-16
+         version: 0.8.1, lastmod: 2006-04-25
 .SH SYNOPSIS
 .B x11vnc
 [OPTION]...

x11vnc/x11vnc.h

@@ -143,7 +143,7 @@
 #undef  NOGUI
 #define NOGUI
 #undef  SKIP_HELP
-#define SKIP_HELP 0
+#define SKIP_HELP 1
 #endif
 
 #if (SMALL_FOOTPRINT > 1)

x11vnc/x11vnc_defs.c

@@ -15,7 +15,7 @@ int xtrap_base_event_type = 0;
 int xdamage_base_event_type = 0;
 
 /*               date +'lastmod: %Y-%m-%d' */
-char lastmod[] = "0.8.1 lastmod: 2006-04-16";
+char lastmod[] = "0.8.1 lastmod: 2006-04-25";
 
 /* X display info */