Always distribute extras/ezio/ezio3.ti.
authorBen Pfaff <blp@nicira.com>
Thu, 30 Jul 2009 00:04:10 +0000 (17:04 -0700)
committerBen Pfaff <blp@nicira.com>
Tue, 1 Dec 2009 17:22:06 +0000 (09:22 -0800)
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.

Makefile.am
extras/ezio/automake.mk

index e9789856d06d36b50af1eca3ddd6bd31b36acf8c..0b6f00e2de38ab544cfa4d1498b425bb80f2b2c4 100644 (file)
@@ -64,8 +64,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
index 2aeaa6440735c6a2be32a74de420b0809538016f..7c7db24124c2bf6ac27fad78837f3599a5fadec8 100644 (file)
@@ -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