[Bug 2907] dist* build targets require our libevent/ to be enabled. HStenn.

bk: 55f6600agWEoCjnG9Ja4H5CHKxjkxg

diff --git a/ChangeLog b/ChangeLog
index e066f19a9e7bba810bfc11a755d46efd4d47fc54..f3d38732e2294282eec205b9a41fa35fd005772d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -18,6 +18,7 @@
 * [Bug 2886] Mis-spelling: "outlyer" should be "outlier".  dave@horsfall.org
 * [Bug 2889] ntp-dev-4.3.67 does not build on Windows.  perlinger@ntp.org
 * [Bug 2890] Ignore ENOBUFS on routing netlink socket.  Konstantin Khlebnikov.
+* [Bug 2907] dist* build targets require our libevent/ to be enabled.  HStenn.
 * libntp/emalloc.c: Remove explicit include of stdint.h.  Harlan Stenn.
 * Put Unity CPPFLAGS items in unity_config.h.  Harlan Stenn.
 * tests/ntpd/g_leapsec.cpp typo fix.  Harlan Stenn.

diff --git a/sntp/Makefile.am b/sntp/Makefile.am
index 61c58803c279d67c5ff7fbe2b42871e2203b5e53..1fa1b31ffbca7ed6882fe6b7679cb49fd1eb53af 100644 (file)
--- a/sntp/Makefile.am
+++ b/sntp/Makefile.am
@@ -269,14 +269,17 @@ $(srcdir)/sntp.html: $(srcdir)/invoke-sntp.menu $(srcdir)/invoke-sntp.texi $(src
 libtool: $(LIBTOOL_DEPS)
        ./config.status --recheck
 
-# HMS: replaces the stock distdir target, which is a lose.
-#distdir: distdir-pre-check
+# HMS: libevent/ is a target if it's in EXTRA_DIST via NTP_FORCE_LIBEVENT_DIST.
+# Note that libevent/ is already in DIST_SUBDIRS (implicit in Makefile.am
+# but explicit in Makefile.in).  This check doesn't help with distclean.
+libevent: distdir-pre-check
 
-# HMS: not great - doesn't stop the build.
+# HMS: Stops the build for gmake or pmake
 distdir-pre-check:
        case "$(DIST_FAIL)" in  \
         '')  ;;                \
-        *) echo "re-run configure adding $(DIST_FAIL) if you want to make a distribution.";    \
+        *) $(error re-run configure adding $(DIST_FAIL) if you want to make a distribution.);  \
+           echo "re-run configure adding $(DIST_FAIL) if you want to make a distribution.";    \
            exit 1 ;;           \
        esac