From: Harlan Stenn <stenn@ntp.org>
Date: Tue, 20 Apr 2010 05:45:17 +0000 (-0400)
Subject: [Bug 1528] Fix EDITLINE_LIBS link order for ntpq and ntpdc
X-Git-Tag: NTP_4_2_7P25~1^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=11e87633195d93a8c169a00ddb4860f13d6ada3d;p=thirdparty%2Fntp.git

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

bk: 4bcd3f6dKGfSSQGzYpSsKQVSE-5eKA
---

diff --git a/ChangeLog b/ChangeLog
index 911ffe2f5..cdb9c7ba8 100644
--- 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 c87c6b74e..4c9a7f4c2 100644
--- 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 268e50e23..5d259b9a8 100644
--- 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