#include <config.h> in new file libntp/ntp_libopts.c

add libopts includes to libntp INCLUDES = now that ntp_libopts.c
  uses them.

bk: 4d09aea2BbjWziF-EYCmqYT5nG-kYA

diff --git a/ChangeLog b/ChangeLog
index 9e7bf4d4d7dbe127f86861962704275154247869..2155846f25da40d8d7557d399be37e532abd9ab2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,7 +11,7 @@
 * [Bug 1751] Support for Atari FreeMiNT OS.
 * [Bug 1754] --version output should be more verbose.
 * Suppress ntp-keygen OpenSSL version display for --help, --version,
-  display both build and runtime OpenSLL versions when they differ.
+  display both build and runtime OpenSSL versions when they differ.
 * Clean up m4 quoting in configure.ac, *.m4 files, resolving
   intermittent AC_LANG_PROGRAM possibly undefined errors.
 * Clean up the SNTP documentation.

diff --git a/libntp/Makefile.am b/libntp/Makefile.am
index 5d728989939ad392ad51b8207ec991053e8d3770..3e7373ae3f3c859c9f1e9c4c38b7a894ea9a8f4f 100644 (file)
--- a/libntp/Makefile.am
+++ b/libntp/Makefile.am
@@ -103,10 +103,10 @@ libntp_a_SRCS =                                           \
 libntp_a_SOURCES = systime.c $(libntp_a_SRCS)
 libntpsim_a_SOURCES = systime_s.c $(libntp_a_SRCS)
 EXTRA_libntp_a_SOURCES = adjtimex.c
-INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/lib/isc/include \
-       -I$(top_srcdir)/lib/isc/nothreads/include \
-       -I$(top_srcdir)/lib/isc/unix/include
 ETAGS_ARGS = Makefile.am
+INCLUDES = -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)
 
 EXTRA_DIST = README
 

diff --git a/libntp/ntp_libopts.c b/libntp/ntp_libopts.c
index d99b5bf6bea5fa6f4a042d375a006160b7bb9f9a..4a9d11985167a386554e520df1b68f64af060041 100644 (file)
--- a/libntp/ntp_libopts.c
+++ b/libntp/ntp_libopts.c
@@ -4,10 +4,13 @@
  * Common code interfacing with Autogen's libopts command-line option
  * processing.
  */
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
 #include <stdio.h>
 #include <stddef.h>
 #include "ntp_libopts.h"
-#include "autoopts/options.h"
 #include "ntp_stdlib.h"
 
 extern const char *Version;    /* version.c for each program */