diff options
| author | Ben Pfaff <blp@nicira.com> | 2009-07-29 16:48:45 -0700 |
|---|---|---|
| committer | Ben Pfaff <blp@nicira.com> | 2009-12-01 09:21:59 -0800 |
| commit | 88aa338eed96ef3cf45bfe9e0048440c740db71b (patch) | |
| tree | bc2d08c00572e824d9146f55d32cd575602ed2b6 /configure.ac | |
| parent | 6d7356763a882cc5dbd814cafd8dacffc6544af6 (diff) | |
| download | openvswitch-88aa338eed96ef3cf45bfe9e0048440c740db71b.tar.gz | |
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 'configure.ac')
| -rw-r--r-- | configure.ac | 49 |
1 files changed, 23 insertions, 26 deletions
diff --git a/configure.ac b/configure.ac index 45d9decb9..86cbe1607 100644 --- a/configure.ac +++ b/configure.ac @@ -37,7 +37,6 @@ AC_USE_SYSTEM_EXTENSIONS AC_C_BIGENDIAN AC_SYS_LARGEFILE -OVS_CHECK_USERSPACE OVS_CHECK_NDEBUG OVS_CHECK_NETLINK OVS_CHECK_OPENSSL @@ -48,33 +47,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) |