diff options
| author | Ben Pfaff <blp@nicira.com> | 2009-07-29 16:48:45 -0700 |
|---|---|---|
| committer | Ben Pfaff <blp@nicira.com> | 2009-07-29 16:48:45 -0700 |
| commit | 31a7c9e7766fed8e72b873850f3798801e442401 (patch) | |
| tree | 628cad6cf1078ad56bb053fca8d0631255f046f2 /acinclude.m4 | |
| parent | c2b070214097fa40dc78252882d96babe7fab4b4 (diff) | |
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.
Diffstat (limited to 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 14 |
1 files changed, 0 insertions, 14 deletions
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 |