repair make distcheck failure with sntp/libopts/Makefile

bk: 4ce8352cGQ66n_FxYQwSCMjpOMMX-Q

diff --git a/Makefile.am b/Makefile.am
index 9822e82cef18085e8185e8968c2a2e46517761cb..83827db2747db743b389d54ded7ee520224c9cd8 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,13 +8,8 @@ SUBDIRS +=             \
        scripts         \
        include         \
        ElectricFence   \
-       $(NULL)
-if NEED_LIBOPTS
-SUBDIRS +=             \
-       sntp/libopts
-endif
-SUBDIRS +=             \
        libntp          \
+       sntp            \
        libparse        \
        ntpd            \
        ntpdate         \
@@ -25,7 +20,6 @@ SUBDIRS +=            \
        adjtimed        \
        clockstuff      \
        kernel          \
-       sntp            \
        util            \
        $(NULL)
 
@@ -35,6 +29,7 @@ DIST_SUBDIRS =                \
        ElectricFence   \
        libntp          \
        libparse        \
+       sntp            \
        ntpd            \
        ntpdate         \
        ntpdc           \
@@ -44,7 +39,6 @@ DIST_SUBDIRS =                \
        adjtimed        \
        clockstuff      \
        kernel          \
-       sntp            \
        util            \
        $(NULL)
 

diff --git a/bootstrap b/bootstrap
index 80b8ab5b4cca07a1d8a4bcbfc5c756f3aefc5368..2a3f4b4b586e430263c442d00a65bea9270b0589 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -122,6 +122,10 @@ cp depsver.mf sntp/
 
 ${AUTORECONF} -i -v
 
+# DH: 20101120: We are back to a single copy of libopts, and
+# once again it seems we need to run autoreconf in sntp after
+# the top-level run to get a correct sntp/libopts/Makefile.in.
+#
 # HMS: 20060618: Now that we use separate copies of libopts
 # we should only need the previous line.
 #
@@ -129,4 +133,4 @@ ${AUTORECONF} -i -v
 ## we get the correct srcdir path in sntp/libopts/Makefile.in
 #rm -rf sntp/autom4te.cache
 #
-#(cd sntp && ${AUTORECONF} -i -v)
+(cd sntp && ${AUTORECONF} -i -v)

diff --git a/configure.ac b/configure.ac
index b700a0d9596d7a90a05a8769e931d1e223b219b4..27f59b9a6d454900a739117a0ca44a3f96f13e6b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -125,7 +125,7 @@ case "${enable_libopts_install+set}" in
  set) ;;
  *) enable_libopts_install=no ;;
 esac
-LIBOPTS_CHECK([sntp/libopts])
+LIBOPTS_CHECK([sntp/libopts], [skip-makefile])
 
 AC_FUNC_FORK
 

diff --git a/sntp/Makefile.am b/sntp/Makefile.am
index bb0952f9b82a2b7e03d7ef5507098b789cbe48ee..14005f5fa6bb760ce47572a28d8660b8d0ce08ba 100644 (file)
--- a/sntp/Makefile.am
+++ b/sntp/Makefile.am
@@ -1,33 +1,32 @@
 # Makefile.am for JMK's SNTP, by Harlan Stenn
 
-NULL=
+NULL =
 
 AUTOMAKE_OPTIONS = foreign 1.10
-ACLOCAL_AMFLAGS= -I ../m4 -I libopts/m4
+ACLOCAL_AMFLAGS = -I ../m4 -I libopts/m4
 
-AM_CPPFLAGS= $(LIBOPTS_CFLAGS) -I$(top_srcdir)/../include \
+AM_CPPFLAGS = $(LIBOPTS_CFLAGS) -I$(top_srcdir)/../include \
        -I$(top_srcdir)/../lib/isc/include \
        -I$(top_srcdir)/../lib/isc/nothreads/include \
        -I$(top_srcdir)/../lib/isc/unix/include
 
-LDADD= $(LIBOPTS_LDADD) $(LIBM) ../libntp/libntp.a @LCRYPTO@
+LDADD =        $(LIBOPTS_LDADD) $(LIBM) ../libntp/libntp.a @LCRYPTO@
 
-run_ag=                cd $(srcdir) && env PATH="$(abs_builddir):$(PATH)"      \
+run_ag =       cd $(srcdir) && env PATH="$(abs_builddir):$(PATH)"      \
                autogen -L ../include --writable
 
 if NTP_BINSUBDIR_IS_BIN
-bin_PROGRAMS=  sntp
+bin_PROGRAMS = sntp
 else
-sbin_PROGRAMS= sntp
+sbin_PROGRAMS =        sntp
 endif
 
 CLEANFILES = check-COPYRIGHT-submake
 
-SUBDIRS=
+SUBDIRS =
 if NEED_LIBOPTS
-SUBDIRS+= libopts
+SUBDIRS += libopts
 endif
-SUBDIRS+= .
 
 sntp_SOURCES =         \
        crypto.c        \
@@ -49,7 +48,7 @@ sntp_SOURCES =                \
        utilities.h     \
        $(NULL)
 
-EXTRA_DIST=                            \
+EXTRA_DIST =                           \
        $(srcdir)/autogen-version.def   \
        bincheck.mf                     \
        $(srcdir)/COPYRIGHT             \

diff --git a/sntp/libopts/m4/libopts.m4 b/sntp/libopts/m4/libopts.m4
index 04bcc69e212e31cfcecc9db5d8f1d764ff853a95..7b6a9fb3052e7c46e7d402485c56ff03d0138566 100644 (file)
--- a/sntp/libopts/m4/libopts.m4
+++ b/sntp/libopts/m4/libopts.m4
@@ -438,7 +438,11 @@ AC_DEFUN([INVOKE_LIBOPTS_MACROS],[
 
 ]) # end AC_DEFUN of INVOKE_LIBOPTS_MACROS
 
-dnl @synopsis  LIBOPTS_CHECK
+dnl @synopsis  LIBOPTS_CHECK(libopts-path, options)
+dnl
+dnl libopts-path defaults to [libopts] if not provided.
+dnl Only one option is supported, [skip-makefile], which
+dnl conditionalizes away the AC_CONFIG_FILES(libopts-path/Makefile).
 dnl
 dnl Time-stamp:        "2010-02-24 08:37:21 bkorb"
 dnl
@@ -532,13 +536,14 @@ AC_DEFUN([LIBOPTS_CHECK],[
   AC_SUBST(LIBOPTS_LDADD)
   AC_SUBST(LIBOPTS_CFLAGS)
   AC_SUBST(LIBOPTS_DIR, AO_Libopts_Dir)
-  AC_CONFIG_FILES(AO_Libopts_Dir/Makefile)
+  AM_CONDITIONAL([BUILD_LIBOPTS], [test -n "${NEED_LIBOPTS_DIR}" -a -z "]$2["])
+  AM_COND_IF([BUILD_LIBOPTS],
+    [AC_CONFIG_FILES(AO_Libopts_Dir/Makefile)])
   m4_popdef([AO_Libopts_Dir])
 
-  [if test -n "${NEED_LIBOPTS_DIR}" ; then]
-    INVOKE_LIBOPTS_MACROS
-  else
-    INVOKE_LIBOPTS_MACROS_FIRST
-  [fi
+  AM_COND_IF([BUILD_LIBOPTS],
+    [INVOKE_LIBOPTS_MACROS],
+    [INVOKE_LIBOPTS_MACROS_FIRST])
+  [
 # end of AC_DEFUN of LIBOPTS_CHECK]
 ])