From e32ebd64a04fcb15a90835ca461b8098b14125df Mon Sep 17 00:00:00 2001 From: dscho Date: Thu, 31 Jan 2008 13:19:28 +0000 Subject: Recurse into subdirectory x11vnc/ when configuring with --with-x11vnc Since we separated the packages LibVNCServer and x11vnc, there is a configure switch --with-x11vnc, without which x11vnc is not built. However, even _with_ this switch, it is not built, because the Makefile would not recurse into the x11vnc/ subdirectory. Fix that. Signed-off-by: Johannes Schindelin --- Makefile.am | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index 02af3e8..4a4fbbf 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,10 @@ CFLAGS=-g -Wall -SUBDIRS=libvncserver examples contrib libvncclient vncterm classes client_examples test +if WITH_X11VNC +X11VNC=x11vnc +endif + +SUBDIRS=libvncserver examples contrib libvncclient vncterm classes client_examples test $(X11VNC) DIST_SUBDIRS=libvncserver examples contrib libvncclient vncterm classes client_examples test bin_SCRIPTS = libvncserver-config -- cgit v1.2.3