the correct way to include rfb.h is now "#include <rfb/rfb.h>"

contrib/Makefile.am

@@ -1,3 +1,4 @@
+CFLAGS = -I ..
 LDADD = ../libvncserver.a
 
 noinst_PROGRAMS=zippy

contrib/x11vnc.c

@@ -74,7 +74,7 @@ typedef KeySym X_KeySym;
 /* the KeySym typedef cannot be removed, so use an alias for rest of file: */
 #define KeySym RFBKeySym
 
-#include "rfb.h"
+#include <rfb/rfb.h>
 
 Display *dpy = 0;
 int scr;

contrib/zippy.c

@@ -1,7 +1,7 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include <rfb.h>
+#include <rfb/rfb.h>
-#include <keysym.h>
+#include <rfb/keysym.h>
 #include "default8x16.h"
 
 int maxx=400, maxy=400, bpp=4;

examples/Makefile.am

@@ -1,3 +1,5 @@
+CFLAGS=-I..
+
 if HAVE_LIBPTHREAD
 BACKGROUND_TEST=blooptest
 endif

examples/colourmaptest.c

@@ -1,4 +1,4 @@
-#include "rfb.h"
+#include <rfb/rfb.h>
 
 
 int main(int argc,char** argv)

examples/example.c

@@ -31,8 +31,8 @@
 #include <netdb.h>
 #endif
 
-#include "rfb.h"
+#include <rfb/rfb.h>
-#include "keysym.h"
+#include <rfb/keysym.h>
 
 const int bpp=4;
 int maxx=800, maxy=600;

examples/fontsel.c

@@ -1,4 +1,4 @@
-#include "rfb.h"
+#include <rfb/rfb.h>
 
 #define FONTDIR "/usr/lib/kbd/consolefonts/"
 #define DEFAULTFONT FONTDIR "default8x16"

examples/mac.c

@@ -38,8 +38,8 @@
 #undef Byte
 #undef TRUE
 #undef Bool
-#include "rfb.h"
+#include <rfb/rfb.h>
-#include "keysym.h"
+#include <rfb/keysym.h>
 
 #include <IOKit/pwr_mgt/IOPMLib.h>
 #include <IOKit/pwr_mgt/IOPM.h>

examples/pnmshow.c

@@ -1,6 +1,6 @@
 #include <stdio.h>
-#include "rfb.h"
+#include <rfb/rfb.h>
-#include "keysym.h"
+#include <rfb/keysym.h>
 
 void HandleKey(Bool down,KeySym key,rfbClientPtr cl)
 {

examples/pnmshow24.c

@@ -1,6 +1,6 @@
 #include <stdio.h>
-#include "rfb.h"
+#include <rfb/rfb.h>
-#include "keysym.h"
+#include <rfb/keysym.h>
 
 #ifndef ALLOW24BPP
 #error "I need the ALLOW24BPP flag to work"

examples/storepasswd.c

@@ -20,7 +20,7 @@
  */
 
 #include <stdio.h>
-#include "rfb.h"
+#include <rfb/rfb.h>
 
 void usage(void)
 {

examples/vncev.c

@@ -3,7 +3,7 @@
 #include <stdlib.h>
 #include <sys/types.h>
 #include <sys/socket.h>
-#include "rfb.h"
+#include <rfb/rfb.h>
 #include "default8x16.h"
 
 char f[640*480];

libvncserver-config.in

@@ -39,8 +39,8 @@ while test $# -gt 0; do
       echo @VERSION@
       ;;
     --cflags)
-      if test @includedir@ != /usr/include ; then
+      if [ "@includedir@" != /usr/include ]; then
-        includes=-I@includedir@
+	  includes=-I@includedir@
       fi
       echo $includes
       ;;

vncterm/Makefile.am

@@ -2,6 +2,8 @@ CONSOLE_SRCS=VNConsole.c
 
 noinst_HEADERS=VNConsole.h vga.h
 
+CFLAGS=-I..
+
 LDADD=../libvncserver.a
 INCLUDES=-I. -I../include
 

vncterm/VNConsole.h

@@ -1,4 +1,4 @@
-#include "rfb.h"
+#include <rfb/rfb.h>
 
 /* this is now the default */
 #define USE_ATTRIBUTE_BUFFER