libopts needs to be built after ElectricFence

bk: 46e3ba95MbB0Oj-pUVEFPoz7ezA6Bw

diff --git a/ChangeLog b/ChangeLog
index 73fc7bb46a54eca66e0e516c8735d1213cad6d1c..8f09e1c30782dbebb08f3b214ad565c4305ebdcc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+* libopts needs to be built after ElectricFence.
 * [Bug 894] Initialize keysdir before calling crypto_setup().
 * Calysto cleanup for ntpq.
 * ntp-keygen -i takes an arg.

diff --git a/Makefile.am b/Makefile.am
index 37513c3d9238bded726a5c8640488e03d99ab341..6cf8188bbe9a86b08eb4dc59f39eac24e8c72559 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,13 +5,14 @@ ACLOCAL_AMFLAGS= -I m4 -I libopts/m4
 NULL=
 
 SUBDIRS=
+SUBDIRS+=              \
+       scripts         \
+       include         \
+       ElectricFence   
 if NEED_LIBOPTS
 SUBDIRS+= libopts
 endif
 SUBDIRS+=              \
-       scripts         \
-       include         \
-       ElectricFence   \
        @ARLIB_DIR@     \
        libntp          \
        libparse        \