From: Brian Aker <brian@tangent.org>
Date: Fri, 25 Jan 2013 22:16:25 +0000 (-0500)
Subject: Fix dependency on build libtest with memcached support.
X-Git-Tag: 1.0.16~3^2~1
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=0d448f88e917669254558793c44e8cbd7e9088df;p=m6w6%2Flibmemcached

Fix dependency on build libtest with memcached support.
---

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