From: Maxim Mamontov <faust.madf@gmail.com>
Date: Sat, 20 Jun 2015 09:32:23 +0000 (+0300)
Subject: Merge branch 'stg-2.409' into stg-2.409-radius
X-Git-Url: https://git.stg.codes/stg.git/commitdiff_plain/70f8adff2c970496bdc45717cad49ddec0405ae7

Merge branch 'stg-2.409' into stg-2.409-radius
---

70f8adff2c970496bdc45717cad49ddec0405ae7
diff --cc stglibs/common.lib/Makefile
index 33f29440,1f662c25..932e2709
--- a/stglibs/common.lib/Makefile
+++ b/stglibs/common.lib/Makefile
@@@ -7,14 -7,10 +7,12 @@@ include ../../Makefile.con
  LIB_NAME = stgcommon
  
  SRCS = common.cpp \
 -	strptime.cpp
 +       strptime.cpp \
 +       blockio.cpp
  
 -INCS = common.h
 +INCS = common.h \
 +       blockio.h
  
- ifneq ($(OS),linux)
- LIBS += -liconv
- endif
+ LIBS += $(LIBICONV)
  
  include ../Makefile.in