diff options
| author | Justin Pettit <jpettit@nicira.com> | 2015-05-07 16:52:06 -0700 |
|---|---|---|
| committer | Justin Pettit <jpettit@nicira.com> | 2015-05-07 16:52:06 -0700 |
| commit | f2d371f7f6e765d8e97a3bd31fffa8197bd45fe2 (patch) | |
| tree | 06ed5bd8c1c0fa2f6d9add596c6efe0f0ef94228 /configure.ac | |
| parent | e387e3e885222651f11a23c401e9e27fca3362ef (diff) | |
| parent | 88c98bf5635c732d4c77e5314ec7440a08a09dec (diff) | |
| download | openvswitch-f2d371f7f6e765d8e97a3bd31fffa8197bd45fe2.tar.gz | |
Merge "master" into "ovn".
This brings in STT.
Conflicts:
tutorial/ovs-sandbox
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 6b28a5262..70e3ab829 100644 --- a/configure.ac +++ b/configure.ac @@ -60,7 +60,7 @@ m4_pattern_forbid([LT_INIT]) dnl Make autoconf fail if libtool is missing. # replacement, but programs using the new version may use APIs not # present in the previous one. In other words, new symbols have been # added and a program linking against the new version may fail with -# “unresolved symbols.” If linking against the old version at runtime: +# "unresolved symbols." If linking against the old version at runtime: # set revision to 0, bump current and age. # # 3. Programs may need to be changed, recompiled, relinked in order to use @@ -81,7 +81,7 @@ AC_SUBST([LT_AGE]) AC_SEARCH_LIBS([pow], [m]) AC_SEARCH_LIBS([clock_gettime], [rt]) AC_SEARCH_LIBS([timer_create], [rt]) -AC_SEARCH_LIBS([pthread_sigmask], [pthread]) +AC_SEARCH_LIBS([pthread_create], [pthread]) AC_FUNC_STRERROR_R OVS_CHECK_ESX @@ -111,6 +111,7 @@ OVS_CHECK_PKIDIR OVS_CHECK_RUNDIR OVS_CHECK_DBDIR OVS_CHECK_BACKTRACE +OVS_CHECK_PERF_EVENT OVS_CHECK_VALGRIND OVS_CHECK_SOCKET_LIBS OVS_CHECK_XENSERVER_VERSION @@ -155,6 +156,7 @@ OVS_ENABLE_OPTION([-Wmissing-prototypes]) OVS_ENABLE_OPTION([-Wmissing-field-initializers]) OVS_ENABLE_OPTION([-Wthread-safety]) OVS_ENABLE_OPTION([-fno-strict-aliasing]) +OVS_ENABLE_OPTION([-Qunused-arguments]) OVS_CONDITIONAL_CC_OPTION([-Wno-unused], [HAVE_WNO_UNUSED]) OVS_CONDITIONAL_CC_OPTION([-Wno-unused-parameter], [HAVE_WNO_UNUSED_PARAMETER]) OVS_ENABLE_WERROR |