From 0a92d9e078addcc0a96ceac878f303a5b1f5a4e9 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Thu, 4 Jun 2009 22:47:22 +0000 Subject: [PATCH] (trunk) try to get the new libevent scheme to play nice with "make dist" --- configure.ac | 7 +++++-- third-party/Makefile.am | 12 ++---------- 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/configure.ac b/configure.ac index c0e03c69e..2cd4d8a0f 100644 --- a/configure.ac +++ b/configure.ac @@ -166,6 +166,11 @@ AC_TRY_LINK([#include ], [va_list ap1, ap2; va_copy(ap1, ap2);], ]) +dnl build our copy of libevent whether we use it or not, +dnl because "make dist" needs its Makefiles to exist, and +dnl AM_CONDITIONAL + AC_CONFIG_SUBDIRS don't seem to play nice +AC_CONFIG_SUBDIRS([third-party/libevent]) + AC_CHECK_HEADER([event-config.h], [libevent_source=system LIBEVENT_CPPFLAGS="" @@ -173,10 +178,8 @@ AC_CHECK_HEADER([event-config.h], [libevent_source=bundled AC_MSG_NOTICE([couldn't find event-config.h, so using our own copy of libevent from third-party/libevent/.]) AC_MSG_NOTICE([if you are cross-compiling this is probably NOT what you want.]) - AC_CONFIG_SUBDIRS([third-party/libevent]) LIBEVENT_CPPFLAGS="-I\$(top_srcdir)/third-party/libevent -I\$(top_builddir)/third-party/libevent" LIBEVENT_LIBS="\$(top_builddir)/third-party/libevent/libevent.la"]) -AM_CONDITIONAL([BUILD_LIBEVENT], [test x$libevent_source = xbundled]) AC_SUBST(LIBEVENT_CPPFLAGS) AC_SUBST(LIBEVENT_LIBS) diff --git a/third-party/Makefile.am b/third-party/Makefile.am index 7a1d395d0..1249218ca 100644 --- a/third-party/Makefile.am +++ b/third-party/Makefile.am @@ -1,14 +1,6 @@ -if BUILD_LIBEVENT - LIBEVENT_DIR = libevent -else - LIBEVENT_DIR = -endif +SUBDIRS = libnatpmp miniupnp dht libevent -SUBDIRS = libnatpmp miniupnp dht $(LIBEVENT_DIR) - -EXTRA_DIST = \ - libevent \ - macosx-libevent-config.h +EXTRA_DIST = macosx-libevent-config.h install: