Add missing --enable-local-libevent help to top-level configure.

bk: 4dbde53fOJKICf1Df-hXlmitq4hzQw

diff --git a/ChangeLog b/ChangeLog
index 62c467e85443a73777fa7b6d7612073cecb96583..d5ef64d5742df52b00e40d6eb3224615a1ed9002 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,7 @@
   library object in ./libevent
 * Share a single sntp/libevent/build-aux directory between all three
   configure scripts.
+* Add missing --enable-local-libevent help to top-level configure.
 (4.2.7p160) 2011/05/01 Released by Harlan Stenn <stenn@ntp.org>
 * from 4.2.6p4-RC1: Upgrade to libopts 35.0.10 from AutoGen 5.11.9pre8.
 * [Bug 1901] Simulator does not set progname.

diff --git a/configure.ac b/configure.ac
index 5dadabcab3b59cde5da05d9b7010b25739c42d12..c91ecaff59b79cc16f8aee16b38cf29d77951bea 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -91,6 +91,8 @@ case "${enable_libopts_install+set}" in
 esac
 LIBOPTS_CHECK_NOBUILD([sntp/libopts])
 
+NTP_ENABLE_LOCAL_LIBEVENT
+
 NTP_LIBNTP
 
 AC_MSG_CHECKING([for deprecated --with-arlib])

diff --git a/sntp/m4/ntp_libevent.m4 b/sntp/m4/ntp_libevent.m4
index 8d96757cfad3d70b35b860105e43ec62bbf1618f..624e16059d62761ffdfea306ea803d1e63afb885 100644 (file)
--- a/sntp/m4/ntp_libevent.m4
+++ b/sntp/m4/ntp_libevent.m4
@@ -1,3 +1,26 @@
+dnl NTP_ENABLE_LOCAL_LIBEVENT                               -*- Autoconf -*-
+dnl
+dnl Provide only the --enable-local-libevent command-line option.
+dnl
+dnl Used standalone by top-level NTP configure.ac, which should have
+dnl --enable-local-libevent in its --help output but which doesn't do
+dnl anything differently based upon its presence or value.
+dnl
+dnl Also AC_REQUIRE'd by NTP_LIBEVENT_CHECK_NOBUILD.
+AC_DEFUN([NTP_ENABLE_LOCAL_LIBEVENT], [
+
+AC_ARG_ENABLE(
+    [local-libevent],
+    [AC_HELP_STRING(
+       [--enable-local-libevent],
+       [Force using the supplied libevent tearoff code]
+    )],
+    [ntp_use_local_libevent=$enableval],
+    [ntp_use_local_libevent=${ntp_use_local_libevent-detect}]
+)
+
+]) dnl NTP_ENABLE_LOCAL_LIBEVENT
+
 dnl NTP_LIBEVENT_CHECK_NOBUILD([MINVERSION [, DIR]])        -*- Autoconf -*-
 dnl
 dnl Look for libevent, which must be at least MINVERSION.
@@ -15,6 +38,7 @@ dnl    NTP_LIBEVENT_CHECK
 dnl
 AC_DEFUN([NTP_LIBEVENT_CHECK_NOBUILD], [
 AC_REQUIRE([NTP_PKG_CONFIG])dnl
+AC_REQUIRE([NTP_ENABLE_LOCAL_LIBEVENT])dnl
 
 ntp_libevent_min_version=m4_default([$1], [2.0.9])
 ntp_libevent_tearoff=m4_default([$2], [libevent])
@@ -22,16 +46,6 @@ ntp_libevent_tearoff=m4_default([$2], [libevent])
 AC_SUBST([CPPFLAGS_LIBEVENT])
 AC_SUBST([LDADD_LIBEVENT])
 
-AC_ARG_ENABLE(
-    [local-libevent],
-    [AC_HELP_STRING(
-       [--enable-local-libevent],
-       [Force using the supplied libevent tearoff code]
-    )],
-    [ntp_use_local_libevent=$enableval],
-    [ntp_use_local_libevent=${ntp_use_local_libevent-detect}]
-)
-
 case "$ntp_use_local_libevent" in
  yes)
     ;;