[groff] 01/01: Fix link error on NetBSD 6.

[Bertrand Garrigues]

bgarrigues pushed a commit to branch master
in repository groff.

commit 89bd6d30cb5ef8720c2b4c0536db0cf660fdac50
Author: Daiki Ueno <address@hidden>
Date:   Sat Apr 11 01:00:05 2015 +0200

    Fix link error on NetBSD 6.
    
    Reported by address@hidden in:
    <https://lists.gnu.org/archive/html/groff/2015-04/msg00000.html>.
    The problem can also be reproduced if gl_cv_func_wcwidth_works=no
    is passed to configure.
    
    * src/preproc/grn/grn.am (grn_LDADD): Change the link order of
    libgroff.a and lib/libgnu.a according to dependency.
    * src/roff/troff/troff.am (troff_LDADD): Likewise.
---
 ChangeLog               |   13 +++++++++++++
 src/preproc/grn/grn.am  |    2 +-
 src/roff/troff/troff.am |    2 +-
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ef1caae..c044a51 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2015-04-10  Daiki Ueno  <address@hidden>
+
+       Fix link error on NetBSD 6.
+
+       Reported by address@hidden in:
+       <https://lists.gnu.org/archive/html/groff/2015-04/msg00000.html>.
+       The problem can also be reproduced if gl_cv_func_wcwidth_works=no
+       is passed to configure.
+
+       * src/preproc/grn/grn.am (grn_LDADD): Change the link order of
+       libgroff.a and lib/libgnu.a according to dependency.
+       * src/roff/troff/troff.am (troff_LDADD): Likewise.
+
 2015-04-08  Werner LEMBERG  <address@hidden>
 
        Fix Savannah bug #44767.
diff --git a/src/preproc/grn/grn.am b/src/preproc/grn/grn.am
index 5bbcdb2..021bfe5 100644
--- a/src/preproc/grn/grn.am
+++ b/src/preproc/grn/grn.am
@@ -24,6 +24,6 @@ grn_SOURCES = \
   src/preproc/grn/main.cpp \
   src/preproc/grn/gprint.h
 src/preproc/grn/main.$(OBJEXT): defs.h
-grn_LDADD = lib/libgnu.a libgroff.a $(LIBM)
+grn_LDADD = libgroff.a lib/libgnu.a $(LIBM)
 PREFIXMAN1 += src/preproc/grn/grn.n
 EXTRA_DIST += src/preproc/grn/README src/preproc/grn/grn.man
diff --git a/src/roff/troff/troff.am b/src/roff/troff/troff.am
index bfffefc..5dc9d6a 100644
--- a/src/roff/troff/troff.am
+++ b/src/roff/troff/troff.am
@@ -22,7 +22,7 @@ EXTRA_DIST += \
   src/roff/troff/column.cpp \
   src/roff/troff/troff.man \
   src/roff/troff/TODO
-troff_LDADD = lib/libgnu.a libgroff.a $(LIBM)
+troff_LDADD = libgroff.a lib/libgnu.a $(LIBM)
 troff_SOURCES = \
   src/roff/troff/dictionary.cpp \
   src/roff/troff/div.cpp \