From: Harlan Stenn <stenn@ntp.org>
Date: Sun, 16 Jan 2011 10:48:00 +0000 (+0000)
Subject: libevent cleanup
X-Git-Tag: NTP_4_2_7P131~16
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=25d21d65c7ec1089d512bb01f3cc78cc343f1eb1;p=thirdparty%2Fntp.git

libevent cleanup

bk: 4d32cce0GjaNH176zZxI7Mams1tiig
---

diff --git a/sntp/Makefile.am b/sntp/Makefile.am
index 90fb3781d..7e1bce473 100644
--- 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