[Bug 1528] Fix EDITLINE_LIBS link order for ntpq and ntpdc

bk: 4bcd3f6dKGfSSQGzYpSsKQVSE-5eKA

diff --git a/ChangeLog b/ChangeLog
index 911ffe2f52d708705a2c2493ae00b641de99798c..cdb9c7ba8b86aac0bab9947b7a649eb06ce50048 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+* [Bug 1528] Fix EDITLINE_LIBS link order for ntpq and ntpdc.
 * Remove --with-arlib from br-flock.
 
 ---

diff --git a/ntpdc/Makefile.am b/ntpdc/Makefile.am
index c87c6b74e0c8d6a3bfb2ad8be0d26073e0039ce8..4c9a7f4c2c56558158db781d38694c528994c011 100644 (file)
--- a/ntpdc/Makefile.am
+++ b/ntpdc/Makefile.am
@@ -14,8 +14,8 @@ AM_CPPFLAGS= -I$(top_srcdir)/include -I$(top_srcdir)/lib/isc/include \
        -I$(top_srcdir)/lib/isc/nothreads/include \
        -I$(top_srcdir)/lib/isc/unix/include $(LIBOPTS_CFLAGS)
 # LDADD might need RESLIB and ADJLIB
-ntpdc_LDADD=   version.o @EDITLINE_LIBS@ $(LIBOPTS_LDADD) \
-               ../libntp/libntp.a @LCRYPTO@
+ntpdc_LDADD=   version.o $(LIBOPTS_LDADD) ../libntp/libntp.a \
+               @EDITLINE_LIBS@ @LCRYPTO@
 # ntpdc-layout doesn't need any additional libraries at all
 ntpdc_layout_LDADD=
 DISTCLEANFILES=        .version version.c

diff --git a/ntpq/Makefile.am b/ntpq/Makefile.am
index 268e50e23635d0eaeacc5ced27493ca1f4c67c69..5d259b9a83335e8be66cf749881bb5be0b02b6ff 100644 (file)
--- a/ntpq/Makefile.am
+++ b/ntpq/Makefile.am
@@ -12,8 +12,8 @@ AM_CPPFLAGS= -I$(top_srcdir)/include -I$(top_srcdir)/lib/isc/include \
        -I$(top_srcdir)/lib/isc/unix/include $(LIBOPTS_CFLAGS)
 
 # LDADD might need RESLIB and ADJLIB
-ntpq_LDADD=    version.o @EDITLINE_LIBS@ $(LIBOPTS_LDADD) \
-               ../libntp/libntp.a @LCRYPTO@
+ntpq_LDADD=    version.o $(LIBOPTS_LDADD) ../libntp/libntp.a \
+               @EDITLINE_LIBS@ @LCRYPTO@
 noinst_HEADERS=        ntpq.h
 noinst_LIBRARIES=      libntpq.a
 libntpq_a_CFLAGS=      -DNO_MAIN_ALLOWED -DBUILD_AS_LIB