[master] reorder linking of libutil

This fixes problem seen when trying to build on FreeBSD
when the package is already installed (making it hard to upgrade).
I tested this on CentOS system too.
I don't like just re-ordering this but this is a quick hack for the problem.
(Another workaround would be to bump the shared library version
but that doesn't work due to the library has a name conflict with
library in base system. These two points will be resolved later.)

diff --git a/src/lib/log/Makefile.am b/src/lib/log/Makefile.am
index fb3aed76aaca6055169c42436daa7277a3c5f1e6..ed23176f770c54a9066bae0e23ebf5a5dec8c6ec 100644 (file)
--- a/src/lib/log/Makefile.am
+++ b/src/lib/log/Makefile.am
@@ -47,5 +47,5 @@ if USE_CLANGPP
 liblog_la_CXXFLAGS += -Wno-error
 endif
 liblog_la_CPPFLAGS = $(AM_CPPFLAGS) $(LOG4CPLUS_INCLUDES)
-liblog_la_LIBADD   = $(LOG4CPLUS_LIBS) $(top_builddir)/src/lib/util/libutil.la
+liblog_la_LIBADD   = $(top_builddir)/src/lib/util/libutil.la $(LOG4CPLUS_LIBS)
 liblog_la_LDFLAGS = -no-undefined -version-info 1:0:0

diff --git a/src/lib/log/tests/Makefile.am b/src/lib/log/tests/Makefile.am
index 615f64b0ecb1c9751ee329ff3ad59f1b4d3378df..3212daaa2e3a075ffb605bde42e61f6fe091e3c4 100644 (file)
--- a/src/lib/log/tests/Makefile.am
+++ b/src/lib/log/tests/Makefile.am
@@ -61,9 +61,9 @@ endif
 AM_CPPFLAGS += $(GTEST_INCLUDES) $(LOG4CPLUS_INCLUDES)
 AM_LDFLAGS  += $(GTEST_LDFLAGS)
 
+AM_LDADD += $(top_builddir)/src/lib/util/libutil.la
 AM_LDADD += $(top_builddir)/src/lib/log/liblog.la
 AM_LDADD += $(top_builddir)/src/lib/util/unittests/libutil_unittests.la
-AM_LDADD += $(top_builddir)/src/lib/util/libutil.la
 AM_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.la
 AM_LDADD += $(top_builddir)/src/lib/util/unittests/libutil_unittests.la
 AM_LDADD += $(GTEST_LDADD)