summaryrefslogtreecommitdiffstats
path: root/Makefile.am
diff options
context:
space:
mode:
authordscho <dscho>2008-01-31 13:19:28 +0000
committerdscho <dscho>2008-01-31 13:19:28 +0000
commite32ebd64a04fcb15a90835ca461b8098b14125df (patch)
tree460c82d18236961302a5c9d60ba322b9281e69f8 /Makefile.am
parentc5173f364f98230bb51fa8c1baf79d171e2c9e72 (diff)
downloadlibtdevnc-e32ebd64a04fcb15a90835ca461b8098b14125df.tar.gz
libtdevnc-e32ebd64a04fcb15a90835ca461b8098b14125df.zip
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 <johannes.schindelin@gmx.de>
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am6
1 files changed, 5 insertions, 1 deletions
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