libevent cleanup

bk: 4d32cce0GjaNH176zZxI7Mams1tiig

diff --git a/sntp/Makefile.am b/sntp/Makefile.am
index 90fb3781dc0631caf5cbf81b9655aa351e4b7c7c..7e1bce473c8582da0a501a314fede954a336feb1 100644 (file)
--- a/sntp/Makefile.am
+++ b/sntp/Makefile.am
@@ -6,17 +6,8 @@ NULL =
 AUTOMAKE_OPTIONS = foreign 1.10
 ACLOCAL_AMFLAGS = -I m4 -I libopts/m4
 
-#AM_CPPFLAGS =                                 \
-#      $(LIBEVENT_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 \
-#      $(NULL)
-
 CFLAGS = @CFLAGS_NTP@
-AM_CPPFLAGS = @CPPFLAGS_NTP@
+AM_CPPFLAGS = $(LIBEVENT_CPPFLAGS) @CPPFLAGS_NTP@
 
 INCLUDES  = $(LIBOPTS_CFLAGS)
 INCLUDES += -I$(top_srcdir)/../include

diff --git a/m4/ntp_libevent.m4 b/sntp/m4/ntp_libevent.m4
similarity index 100%
rename from m4/ntp_libevent.m4
rename to sntp/m4/ntp_libevent.m4