Imported Upstream version 2.6.0

This commit is contained in:
arnaud.quette@free.fr 2011-01-26 10:35:08 +01:00
parent 26fb71b504
commit 459aaf9392
510 changed files with 40508 additions and 18859 deletions

View file

@ -10,12 +10,12 @@ endif
if WITH_SSL
AM_CFLAGS += $(LIBSSL_CFLAGS)
endif
LDADD = ../common/libcommon.a ../common/libparseconf.la $(NETLIBS)
LDADD = ../common/libcommon.la ../common/libparseconf.la $(NETLIBS)
if WITH_WRAP
LDADD += $(LIBWRAP_LDFLAGS)
LDADD += $(LIBWRAP_LIBS)
endif
if WITH_SSL
LDADD += $(LIBSSL_LDFLAGS)
LDADD += $(LIBSSL_LIBS)
endif
sbin_PROGRAMS = upsd