From f28ed0a96509c1f6fbbb5caa620f7846855efa9d Mon Sep 17 00:00:00 2001
From: Mike Hibler <hibler@cs.utah.edu>
Date: Thu, 20 Feb 2014 11:36:04 -0700
Subject: [PATCH] Make the --disable-events configure option work again.
Not sure this is really useful, but Kevin Tew's test framework
uses it.
---
clientside/GNUmakefile.in | 7 +++++--
clientside/lib/GNUmakefile.in | 7 +++++--
clientside/tools/pcapper/GNUmakefile.in | 8 +++++++-
3 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/clientside/GNUmakefile.in b/clientside/GNUmakefile.in
index 06b1ebb30d..15bacf857f 100644
--- a/clientside/GNUmakefile.in
+++ b/clientside/GNUmakefile.in
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2000-2012 University of Utah and the Flux Group.
+# Copyright (c) 2000-2014 University of Utah and the Flux Group.
#
# {{{EMULAB-LICENSE
#
@@ -28,7 +28,10 @@ SYSTEM := $(shell uname -s)
include $(OBJDIR)/Makeconf
-SUBDIRS = lib event tools os sensors tmcc protogeni
+SUBDIRS = lib tools os sensors tmcc protogeni
+ifneq ($(EVENTSYS),0)
+SUBDIRS += event
+endif
ifeq ($(WITH_EMULAB),1)
all: all-subdirs
diff --git a/clientside/lib/GNUmakefile.in b/clientside/lib/GNUmakefile.in
index 72f4608e98..1f753dd35a 100644
--- a/clientside/lib/GNUmakefile.in
+++ b/clientside/lib/GNUmakefile.in
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2000-2013 University of Utah and the Flux Group.
+# Copyright (c) 2000-2014 University of Utah and the Flux Group.
#
# {{{EMULAB-LICENSE
#
@@ -27,7 +27,10 @@ SUBDIR = $(subst $(TESTBED_SRCDIR)/,,$(SRCDIR))
include $(OBJDIR)/Makeconf
-SUBDIRS = libtb event tmcd
+SUBDIRS = libtb tmcd
+ifneq ($(EVENTSYS),0)
+SUBDIRS += event
+endif
all: all-subdirs
diff --git a/clientside/tools/pcapper/GNUmakefile.in b/clientside/tools/pcapper/GNUmakefile.in
index 94c636a884..9fe8b17442 100644
--- a/clientside/tools/pcapper/GNUmakefile.in
+++ b/clientside/tools/pcapper/GNUmakefile.in
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2000-2012 University of Utah and the Flux Group.
+# Copyright (c) 2000-2014 University of Utah and the Flux Group.
#
# {{{EMULAB-LICENSE
#
@@ -56,12 +56,18 @@ PTHREADCFLAGS = -D_THREAD_SAFE
PTHREADLIBS = -lpthread
endif
+ifneq ($(EVENTSYS),0)
ELVINFLAGS = -I/usr/local/include
ELVINLIBS = -L/usr/local/lib -lpubsub -lm
EVENTFLAGS = -DEVENTSYS -I$(TESTBED_LIBSRCDIR)/event $(ELVINFLAGS)
EVENTOBJS = $(TESTBED_LIBOBJDIR)/event/event.o \
$(TESTBED_LIBOBJDIR)/event/util.o
EVENTLIBS = $(ELVINLIBS) -lcrypto
+else
+EVENTFLAGS =
+EVENTOBJS =
+EVENTLIBS =
+endif
TBCFLAGS = $(EVENTFLAGS) -I$(TESTBED_LIBSRCDIR)/libtb
TBLIBS = $(EVENTOBJS) $(TESTBED_LIBOBJDIR)/libtb/libtb.a $(EVENTLIBS)
--
GitLab