diff options
| author | Brian Aker <brian@tangent.org> | 2013-01-25 17:16:25 -0500 |
|---|---|---|
| committer | Brian Aker <brian@tangent.org> | 2013-01-25 17:16:25 -0500 |
| commit | 0d448f88e917669254558793c44e8cbd7e9088df (patch) | |
| tree | b94ea31868c9322340c925bc4113615dd77db4d5 | |
| parent | 51413212545b0e50b0f79f13994a792402814614 (diff) | |
| download | libmemcached-0d448f88e917669254558793c44e8cbd7e9088df.tar.gz | |
Fix dependency on build libtest with memcached support.
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | 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 |