acinclude.m4: Do not set vswitchd_ovs_vswitchd_LDFLAGS

Commit d731058 used vswitchd_ovs_vswitchd_LDFLAGS to link with DPDK. This made automake ignore AM_LDFLAGS while linking the daemon. This commit explicitly adds AM_LDFLAGS to vswitchd_ovs_vswitchd_LDFLAGS and moves it to vswitchd/automake.mk Reported-by: Gurucharan Shetty <[email protected]> Suggested-by: Ben Pfaff <[email protected]> Signed-off-by: Daniele Di Proietto <[email protected]> Signed-off-by: Gurucharan Shetty <[email protected]>
liuyong240 · Aug 18, 2014 · 9475dfe · 9475dfe
1 parent 6ce798b
commit 9475dfe
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/acinclude.m4 b/acinclude.m4
@@ -208,8 +208,8 @@ AC_DEFUN([OVS_CHECK_DPDK], [
     #
     # These options are specified inside a single -Wl directive to prevent
     # autotools from reordering them.
-    vswitchd_ovs_vswitchd_LDFLAGS=-Wl,--whole-archive,$DPDK_LIB,--no-whole-archive
-    AC_SUBST([vswitchd_ovs_vswitchd_LDFLAGS])
+    DPDK_vswitchd_LDFLAGS=-Wl,--whole-archive,$DPDK_LIB,--no-whole-archive
+    AC_SUBST([DPDK_vswitchd_LDFLAGS])
     AC_DEFINE([DPDK_NETDEV], [1], [System uses the DPDK module.])
   else
     RTE_SDK=

diff --git a/vswitchd/automake.mk b/vswitchd/automake.mk
@@ -15,6 +15,7 @@ vswitchd_ovs_vswitchd_LDADD = \
 	ofproto/libofproto.la \
 	lib/libsflow.la \
 	lib/libopenvswitch.la
+vswitchd_ovs_vswitchd_LDFLAGS = $(AM_LDFLAGS) $(DPDK_vswitchd_LDFLAGS)
 EXTRA_DIST += vswitchd/INTERNALS
 MAN_ROOTS += vswitchd/ovs-vswitchd.8.in