From: Ben Pfaff <blp@nicira.com>
Date: Thu, 30 Jul 2009 00:04:10 +0000 (-0700)
Subject: Always distribute extras/ezio/ezio3.ti.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3b7c608d6afeea32ff8d6ce616970c7d095b4bcc;p=openvswitch

Always distribute extras/ezio/ezio3.ti.

I had thought that Automake was smart enough to ignore conditionals around
EXTRA_DIST, so that all files always got distributed regardless of whether
Automake conditionals were set.  I was wrong.

This pushes the conditionals for building the ezio binaries down into
extras/ezio/automake.mk and thereby makes adding ezio3.ti to EXTRA_DIST
unconditional, so that it always gets distributed.  Otherwise, this file
will not be distributed on systems that don't have curses or don't have
PCRE, which is very surprising.
---

diff --git a/Makefile.am b/Makefile.am
index 9413ce59..1b49456b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -66,8 +66,4 @@ include third-party/automake.mk
 include debian/automake.mk
 include vswitchd/automake.mk
 include xenserver/automake.mk
-if HAVE_CURSES
-if HAVE_PCRE
 include extras/ezio/automake.mk
-endif
-endif
diff --git a/extras/ezio/automake.mk b/extras/ezio/automake.mk
index 2aeaa644..7c7db241 100644
--- a/extras/ezio/automake.mk
+++ b/extras/ezio/automake.mk
@@ -6,6 +6,9 @@
 # without warranty of any kind.
 
 EXTRA_DIST += extras/ezio/ezio3.ti
+
+if HAVE_CURSES
+if HAVE_PCRE
 install-data-hook:
 	@echo tic -x $(srcdir)/extras/ezio/ezio3.ti
 	@if ! tic -x $(srcdir)/extras/ezio/ezio3.ti; then			      \
@@ -47,3 +50,5 @@ extras_ezio_ovs_switchui_LDADD = \
 	$(PCRE_LIBS) \
 	$(SSL_LIBS) \
 	-lm
+endif # HAVE_PCRE
+endif # HAVE_CURSES