瀏覽代碼

snmp: Allow buildling of corosync on already existing older install of corosync

When building corosync against older libraries already installed on the system,
the corosync-notifyd application uses the wrong Makefile.am commands.  This
results in the SNMPLIBS (which includes -L/usr/lib64) coming before the proper
LDADD flags.  The result is an inability to compile on an already existing
installation.

Signed-off-by: Steven Dake <sdake@redhat.com>
Reviewed-by: Angus Salkeld <asalkeld@redhat.com>
Steven Dake 15 年之前
父節點
當前提交
d9b2f3937b
共有 1 個文件被更改,包括 2 次插入2 次删除
  1. 2 2
      tools/Makefile.am

+ 2 - 2
tools/Makefile.am

@@ -54,10 +54,10 @@ corosync_quorumtool_LDADD = -lconfdb -lcfg -lquorum \
 			    -lvotequorum -lcoroipcc ../lcr/liblcr.a
 			    -lvotequorum -lcoroipcc ../lcr/liblcr.a
 corosync_quorumtool_LDFLAGS = -L../lib
 corosync_quorumtool_LDFLAGS = -L../lib
 
 
-corosync_notifyd_LDADD = -L../lib
-corosync_notifyd_LDFLAGS = -lcfg -lconfdb ../lcr/liblcr.a -lcoroipcc \
+corosync_notifyd_LDADD = -lcfg -lconfdb ../lcr/liblcr.a -lcoroipcc \
 			   ../exec/coropoll.o $(DBUS_LIBS) $(SNMPLIBS) \
 			   ../exec/coropoll.o $(DBUS_LIBS) $(SNMPLIBS) \
 			   -lquorum
 			   -lquorum
+corosync_notifyd_LDFLAGS = -L../lib
 corosync_notifyd_CPPFLAGS = $(DBUS_CFLAGS)
 corosync_notifyd_CPPFLAGS = $(DBUS_CFLAGS)