projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ofproto: Fix bad merge in previous commit.
[openvswitch]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index dccb8cfdf92a3dd4dc9f3276e7533f68769587f8..1b49456bc87cc87d79e9c105215528d313c1b7ca 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-9,7
+9,6
@@
AUTOMAKE_OPTIONS = foreign subdir-objects
ACLOCAL_AMFLAGS = -I m4
SUBDIRS = datapath
ACLOCAL_AMFLAGS = -I m4
SUBDIRS = datapath
-if ENABLE_USERSPACE
AM_CPPFLAGS = $(SSL_CFLAGS)
AM_CPPFLAGS += $(NCURSES_CFLAGS)
AM_CPPFLAGS += $(PCRE_CFLAGS)
AM_CPPFLAGS = $(SSL_CFLAGS)
AM_CPPFLAGS += $(NCURSES_CFLAGS)
AM_CPPFLAGS += $(PCRE_CFLAGS)
@@
-67,9
+66,4
@@
include third-party/automake.mk
include debian/automake.mk
include vswitchd/automake.mk
include xenserver/automake.mk
include debian/automake.mk
include vswitchd/automake.mk
include xenserver/automake.mk
-if HAVE_CURSES
-if HAVE_PCRE
include extras/ezio/automake.mk
include extras/ezio/automake.mk
-endif
-endif
-endif # ENABLE_USERSPACE