[Bug 1418] building ntpd/ntpdc/ntpq statically with ssl fails.

bk: 4b26ab92Zvho3p-PYX2YUTdlZJjHzg

diff --git a/ChangeLog b/ChangeLog
index 6d7fc017e4d7633757ef1d291c35d89b591dd7e8..8eedd3ef6204aac7a9f87197ba74fdfd8254f91a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+---
+
+* [Bug 1418] building ntpd/ntpdc/ntpq statically with ssl fails.
+
 ---
 (4.2.6) 2009/12/09 Released by Harlan Stenn <stenn@ntp.org>
 * Include (4.2.4p8) - [Sec 1331] DoS with mode 7 packets - CVE-2009-3563.

diff --git a/ntpd/Makefile.am b/ntpd/Makefile.am
index 37d4c30e9a1a9b0c0c46299e6113b4d7305cd917..0ed6f18764b742075d05e27b0095bb7ce3627d90 100644 (file)
--- a/ntpd/Makefile.am
+++ b/ntpd/Makefile.am
@@ -83,8 +83,8 @@ man_MANS=     ntpd.1
 # floor                               refclock_wwv.o
 # which are (usually) provided by -lm.
 keyword_gen_LDADD = ../libntp/libntp.a
-ntpd_LDADD = $(LDADD) -lm @LCRYPTO@ @LSCF@ $(LIBOPTS_LDADD) ../libntp/libntp.a
-ntpdsim_LDADD = $(LDADD) -lm @LCRYPTO@ @LSCF@ $(LIBOPTS_LDADD) ../libntp/libntpsim.a
+ntpd_LDADD = $(LDADD) $(LIBOPTS_LDADD) ../libntp/libntp.a -lm @LCRYPTO@ @LSCF@
+ntpdsim_LDADD = $(LDADD) $(LIBOPTS_LDADD) ../libntp/libntpsim.a -lm @LCRYPTO@ @LSCF@
 ntpdsim_CFLAGS = $(CFLAGS) -DSIM
 check_y2k_LDADD = $(LDADD) ../libntp/libntp.a
 DISTCLEANFILES = keyword-gen .version version.c

diff --git a/ntpdc/Makefile.am b/ntpdc/Makefile.am
index 19eec3ddc1071a4c9f0ec3bca2894ea67041a8c3..30900dd4ca86a8fccb2b303734cb1158c0585ed2 100644 (file)
--- a/ntpdc/Makefile.am
+++ b/ntpdc/Makefile.am
@@ -10,8 +10,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 @LCRYPTO@ @EDITLINE_LIBS@ $(LIBOPTS_LDADD) \
-               ../libntp/libntp.a
+ntpdc_LDADD=   version.o @EDITLINE_LIBS@ $(LIBOPTS_LDADD) \
+               ../libntp/libntp.a @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 a4771a6d732e20920134e21a2a2082d39c841a8c..fe0c52439a6296f7842a7e0738f1ba6d0b91964e 100644 (file)
--- a/ntpq/Makefile.am
+++ b/ntpq/Makefile.am
@@ -8,8 +8,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 @LCRYPTO@ @EDITLINE_LIBS@ $(LIBOPTS_LDADD) \
-               ../libntp/libntp.a
+ntpq_LDADD=    version.o @EDITLINE_LIBS@ $(LIBOPTS_LDADD) \
+               ../libntp/libntp.a @LCRYPTO@
 noinst_HEADERS=        ntpq.h
 noinst_LIBRARIES=      libntpq.a
 # HMS: I don't think we need libntpq_a_LIBADD...