From 31a7c9e7766fed8e72b873850f3798801e442401 Mon Sep 17 00:00:00 2001
From: Ben Pfaff <blp@nicira.com>
Date: Wed, 29 Jul 2009 16:48:45 -0700
Subject: [PATCH] Remove --disable-userspace "configure" option, since it
 breaks "make dist".

I had thought that Automake was smart enough to ignore conditionals around
EXTRA_DIST, so that all files always got distributed regardless of whether
Automake conditionals were set.  I was wrong.

This commit removes the --disable-userspace option to "configure", which
put a conditional around most of Makefile.am and thus unintentionally
caused most of the distribution to be left out if --disable-userspace was
specified.  The alternative (fixing --disable-userspace) seems like too
much work--it would require pushing "if ENABLE_USERSPACE" down into lots
of subdirectory--and would be difficult to maintain.
---
 Makefile.am  |  2 --
 acinclude.m4 | 14 --------------
 configure.ac | 49 +++++++++++++++++++++++--------------------------
 3 files changed, 23 insertions(+), 42 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index dccb8cfd..9413ce59 100644
--- 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)
@@ -72,4 +71,3 @@ if HAVE_PCRE
 include extras/ezio/automake.mk
 endif
 endif
-endif # ENABLE_USERSPACE
diff --git a/acinclude.m4 b/acinclude.m4
index 42949209..2f38997f 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -14,20 +14,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-dnl Checks for --disable-userspace.
-AC_DEFUN([OVS_CHECK_USERSPACE],
-  [AC_ARG_ENABLE(
-     [userspace],
-     [AC_HELP_STRING([--disable-userspace], 
-                     [Disable building userspace components.])],
-     [case "${enableval}" in
-        (yes) build_userspace=true ;;
-        (no)  build_userspace=false ;;
-        (*) AC_MSG_ERROR([bad value ${enableval} for --enable-userspace]) ;;
-      esac],
-     [build_userspace=true])
-   AM_CONDITIONAL([ENABLE_USERSPACE], [$build_userspace])])
-
 dnl OVS_CHECK_LINUX(OPTION, VERSION, VARIABLE, CONDITIONAL)
 dnl
 dnl Configure linux kernel source tree 
diff --git a/configure.ac b/configure.ac
index ad38ea79..d674ab47 100644
--- a/configure.ac
+++ b/configure.ac
@@ -38,7 +38,6 @@ AC_USE_SYSTEM_EXTENSIONS
 AC_C_BIGENDIAN
 AC_SYS_LARGEFILE
 
-OVS_CHECK_USERSPACE
 OVS_CHECK_COVERAGE
 OVS_CHECK_NDEBUG
 OVS_CHECK_NETLINK
@@ -50,33 +49,31 @@ OVS_CHECK_PCRE
 OVS_CHECK_IF_PACKET
 OVS_CHECK_STRTOK_R
 
-if $build_userspace; then
-    OVS_CHECK_PKIDIR
-    OVS_CHECK_RUNDIR
-    OVS_CHECK_MALLOC_HOOKS
-    OVS_CHECK_VALGRIND
-    OVS_CHECK_TTY_LOCK_DIR
-    OVS_CHECK_SOCKET_LIBS
-    OVS_CHECK_FAULT_LIBS
+OVS_CHECK_PKIDIR
+OVS_CHECK_RUNDIR
+OVS_CHECK_MALLOC_HOOKS
+OVS_CHECK_VALGRIND
+OVS_CHECK_TTY_LOCK_DIR
+OVS_CHECK_SOCKET_LIBS
+OVS_CHECK_FAULT_LIBS
 
-    AC_CHECK_FUNCS([strsignal])
+AC_CHECK_FUNCS([strsignal])
 
-    OVS_ENABLE_OPTION([-Wall])
-    OVS_ENABLE_OPTION([-Wno-sign-compare])
-    OVS_ENABLE_OPTION([-Wpointer-arith])
-    OVS_ENABLE_OPTION([-Wdeclaration-after-statement])
-    OVS_ENABLE_OPTION([-Wformat-security])
-    OVS_ENABLE_OPTION([-Wswitch-enum])
-    OVS_ENABLE_OPTION([-Wunused-parameter])
-    OVS_ENABLE_OPTION([-Wstrict-aliasing])
-    OVS_ENABLE_OPTION([-Wbad-function-cast])
-    OVS_ENABLE_OPTION([-Wcast-align])
-    OVS_ENABLE_OPTION([-Wstrict-prototypes])
-    OVS_ENABLE_OPTION([-Wold-style-definition])
-    OVS_ENABLE_OPTION([-Wmissing-prototypes])
-    OVS_ENABLE_OPTION([-Wmissing-field-initializers])
-    OVS_ENABLE_OPTION([-Wno-override-init])
-fi
+OVS_ENABLE_OPTION([-Wall])
+OVS_ENABLE_OPTION([-Wno-sign-compare])
+OVS_ENABLE_OPTION([-Wpointer-arith])
+OVS_ENABLE_OPTION([-Wdeclaration-after-statement])
+OVS_ENABLE_OPTION([-Wformat-security])
+OVS_ENABLE_OPTION([-Wswitch-enum])
+OVS_ENABLE_OPTION([-Wunused-parameter])
+OVS_ENABLE_OPTION([-Wstrict-aliasing])
+OVS_ENABLE_OPTION([-Wbad-function-cast])
+OVS_ENABLE_OPTION([-Wcast-align])
+OVS_ENABLE_OPTION([-Wstrict-prototypes])
+OVS_ENABLE_OPTION([-Wold-style-definition])
+OVS_ENABLE_OPTION([-Wmissing-prototypes])
+OVS_ENABLE_OPTION([-Wmissing-field-initializers])
+OVS_ENABLE_OPTION([-Wno-override-init])
 
 AC_ARG_VAR(KARCH, [Kernel Architecture String])
 AC_SUBST(KARCH)
-- 
2.30.2