summaryrefslogtreecommitdiffstats
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
parentc5173f364f98230bb51fa8c1baf79d171e2c9e72 (diff)
downloadlibvncserver-e32ebd64a04fcb15a90835ca461b8098b14125df.zip
libvncserver-e32ebd64a04fcb15a90835ca461b8098b14125df.tar.gz
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>
-rw-r--r--Makefile.am6
-rw-r--r--configure.ac1
2 files changed, 6 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
diff --git a/configure.ac b/configure.ac
index 7f01100..b7ff969 100644
--- a/configure.ac
+++ b/configure.ac
@@ -704,6 +704,7 @@ for directory in packages OpenLinux redhat RedHat rpm RPM "" ; do
done
echo "$RPMSOURCEDIR"
AM_CONDITIONAL(HAVE_RPM, test "$RPMSOURCEDIR" != "NOT-FOUND")
+AM_CONDITIONAL(WITH_X11VNC, test "$build_x11vnc" = "yes")
AC_SUBST(RPMSOURCEDIR)
AC_CONFIG_FILES([Makefile
OpenPOWER on IntegriCloud