Conditionally compile the server's local socket interface.

5 files changed, 37 insertions, 15 deletions

diff --git a/configure.ac b/configure.ac
index 38151ca..67cdd89 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,9 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.57)
-AC_INIT([linpicker],
-        2.0,
-        [ewalsh@tycho.nsa.gov])
+AC_INIT([linpicker], 2.0, [ewalsh@tycho.nsa.gov])
 AC_CONFIG_SRCDIR([src/main.c])
 AC_CONFIG_HEADERS([src/config.h])
 
@@ -13,15 +11,24 @@ AM_INIT_AUTOMAKE([dist-bzip2])
 AC_DISABLE_STATIC
 AC_PROG_LIBTOOL
 AC_PROG_CC
-AC_PROG_CC_STDC
 AM_PROG_CC_C_O
+AC_PROG_RANLIB
 
 # Checks for pkg-config packages
 PKG_CHECK_MODULES(DFB, directfb >= 1.4.2)
 PKG_CHECK_MODULES(UDEV, libudev >= 145)
 PKG_CHECK_MODULES(XCB, xcb)
 
-AC_HEADER_STDC
-AC_PROG_RANLIB
+# Build options and defines
+AC_ARG_ENABLE(socket,
+	AS_HELP_STRING([--enable-socket], [Enable local socket interface [default=no]]),
+	[LOCALSOCK=$enableval], [LOCALSOCK=no])
+
+if test "x$LOCALSOCK" = xyes; then
+	AC_DEFINE(LOCALSOCK, 1, [Enable local socket interface])
+fi
+AM_CONDITIONAL(LOCALSOCK, [test "x$LOCALSOCK" = xyes])
+
+# Output
 AC_CONFIG_FILES([Makefile src/Makefile libvchan/Makefile data/Makefile])
 AC_OUTPUT
diff --git a/src/Makefile.am b/src/Makefile.am
index a515368..d25280f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,6 +1,6 @@
-bin_PROGRAMS = linpicker_server linpicker_debug track
+bin_PROGRAMS = linpicker_server track
 
-linpicker_server_CFLAGS = -g -Wall -I.. $(DFB_CFLAGS) $(UDEV_CFLAGS) \
+linpicker_server_CFLAGS = -I../libvchan $(DFB_CFLAGS) $(UDEV_CFLAGS) \
 			  -DPKGDATADIR="\"$(pkgdatadir)\""
 linpicker_server_SOURCES = main.c local.c input.c comm.c \
 			   view.c buffer.c client.c display.c \
@@ -11,9 +11,11 @@ linpicker_server_LDADD = ../libvchan/libvchan.la \
 			 -luuid -lblktapctl -lutil \
 			 $(DFB_LIBS) $(UDEV_LIBS)
 
-linpicker_debug_CFLAGS = -g -Wall
-linpicker_debug_SOURCES = debug.c
-
-track_CFLAGS = -g -Wall -I.. $(XCB_CFLAGS)
+track_CFLAGS = -I../libvchan $(XCB_CFLAGS)
 track_SOURCES = track.c
 track_LDADD = ../libvchan/libvchan.la -lxenctrl -lxenstore $(XCB_LIBS)
+
+if LOCALSOCK
+noinst_PROGRAMS = linpicker_debug
+linpicker_debug_SOURCES = debug.c
+endif
diff --git a/src/local.c b/src/local.c
index 6293b61..7f7bb5d 100644
--- a/src/local.c
+++ b/src/local.c
@@ -7,10 +7,13 @@
 #include <unistd.h>
 #include <errno.h>
 
+#include "config.h"
 #include "local.h"
 #include "server.h"
 #include "view.h"
 
+#ifdef LOCALSOCK
+
 static int sd;
 
 static void
@@ -62,3 +65,13 @@ local_init(int argc, char **argv)
 
 	return server_set_fd_handler(sd, local_process, NULL);
 }
+
+#else
+
+int
+local_init(int argc, char **argv)
+{
+	return 0;
+}
+
+#endif
diff --git a/src/track.c b/src/track.c
index 036be12..05a9931 100644
--- a/src/track.c
+++ b/src/track.c
@@ -29,8 +29,8 @@
 #include <xcb/xcb.h>
 #include <xcb/xproto.h>
 
+#include "libvchan.h"
 #include "comm-structs.h"
-#include "libvchan/libvchan.h"
 #include "xen_common.h"
 
 /* XXX */
diff --git a/src/xen_linpicker.c b/src/xen_linpicker.c
index 5d634aa..ca3bec1 100644
--- a/src/xen_linpicker.c
+++ b/src/xen_linpicker.c
@@ -13,7 +13,8 @@
 #include <xs.h>
 #include <xenctrl.h>
 #include <xen/grant_table.h>
-#include "libxl.h"
+#include <libxl.h>
+#include "libvchan.h"
 
 #include "xen_backend.h"
 #include "xen_linpicker.h"
@@ -21,7 +22,6 @@
 #include "comm.h"
 #include "client.h"
 #include "buffer.h"
-#include "libvchan/libvchan.h"
 
 /* ------------------------------------------------------------- */