Remove --disable-userspace "configure" option, since it breaks "make dist".

[openvswitch] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 18dbb53db7e12c78e6e09792e6a9555f2cbbb252..9413ce59ed167dcda13cfef5995758aa478571f0 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,7 +9,6 @@ AUTOMAKE_OPTIONS = foreign subdir-objects
 ACLOCAL_AMFLAGS = -I m4
 SUBDIRS = datapath
 
-if ENABLE_USERSPACE
 AM_CPPFLAGS = $(SSL_CFLAGS)
 AM_CPPFLAGS += $(NCURSES_CFLAGS)
 AM_CPPFLAGS += $(PCRE_CFLAGS)
@@ -27,9 +26,11 @@ endif
 
 CLEANFILES =
 DISTCLEANFILES =
-EXTRA_DIST = INSTALL.Linux INSTALL.XenServer INSTALL.SSL
-TESTS =
-TESTS_ENVIRONMENT =
+EXTRA_DIST = INSTALL.bridge \
+       INSTALL.Linux \
+       INSTALL.OpenFlow \
+       INSTALL.SSL \
+       INSTALL.XenServer 
 bin_PROGRAMS =
 sbin_PROGRAMS =
 bin_SCRIPTS =
@@ -70,4 +71,3 @@ if HAVE_PCRE
 include extras/ezio/automake.mk
 endif
 endif
-endif # ENABLE_USERSPACE