From 0d448f88e917669254558793c44e8cbd7e9088df Mon Sep 17 00:00:00 2001 From: Brian Aker Date: Fri, 25 Jan 2013 17:16:25 -0500 Subject: [PATCH] Fix dependency on build libtest with memcached support. --- configure.ac | 2 -- libtest/include.am | 4 ++++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 68c9fa10..2435c69e 100644 --- a/configure.ac +++ b/configure.ac @@ -84,8 +84,6 @@ AM_CONDITIONAL([BUILDING_LIBMEMCACHED],[true]) AM_CONDITIONAL([HAVE_LIBMEMCACHED],[false]) AM_CONDITIONAL([HAVE_LIBDRIZZLE],[false]) AC_DEFINE([HAVE_LIBMEMCACHED],[1],[Enables libmemcached Support]) -AC_SUBST([LIBMEMCACHED_CFLAGS]) -AC_SUBST([LIBMEMCACHED_LIB],[libmemcached/libmemcached.la]) AM_CONDITIONAL([BUILDING_GEARMAN],[false]) diff --git a/libtest/include.am b/libtest/include.am index 090e9fb1..d1ede13b 100644 --- a/libtest/include.am +++ b/libtest/include.am @@ -108,8 +108,12 @@ libtest_libtest_la_CXXFLAGS= EXTRA_libtest_libtest_la_DEPENDENCIES= libtest_libtest_la_LIBADD= libtest_libtest_la_SOURCES= +if BUILDING_LIBMEMCACHED +libtest_libtest_la_LIBADD+= libmemcached/libmemcached.la +else libtest_libtest_la_CXXFLAGS+= @LIBMEMCACHED_CFLAGS@ libtest_libtest_la_LIBADD+= @LIBMEMCACHED_LIB@ +endif libtest_libtest_la_SOURCES+= libtest/alarm.cc libtest_libtest_la_SOURCES+= libtest/binaries.cc -- 2.30.2