libmemcached

Merge lp:~mordred/libmemcached/fix850399 into lp:~tangent-org/libmemcached/trunk

  1. fix850399
  2. Merge into trunk
Proposed by Monty Taylor
Status: Merged
Merge reported by: Brian Aker
Merged at revision: not available
Proposed branch: lp:~mordred/libmemcached/fix850399
Merge into: lp:~tangent-org/libmemcached/trunk
Diff against target: 19 lines (+0/-2)
1 file modified
configure.ac (+0/-2)
To merge this branch: bzr merge lp:~mordred/libmemcached/fix850399
Reviewer Review Type Date Requested Status
Libmemcached-developers Pending
Review via email: mp+78693@code.launchpad.net

Description of the change

This should sort out the duplicate symbol issue. I'll look at making this a little richer later on.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'configure.ac'
--- configure.ac 2011-10-05 21:43:41 +0000
+++ configure.ac 2011-10-08 03:10:27 +0000
@@ -60,7 +60,6 @@
6060
61m4_include([m4/memcached.m4])61m4_include([m4/memcached.m4])
62m4_include([m4/memcached_sasl.m4])62m4_include([m4/memcached_sasl.m4])
63m4_include([m4/gearmand.m4])
6463
65AM_CONDITIONAL(BUILDING_LIBMEMCACHED, true)64AM_CONDITIONAL(BUILDING_LIBMEMCACHED, true)
66AM_CONDITIONAL(HAVE_LIBMEMCACHED, false)65AM_CONDITIONAL(HAVE_LIBMEMCACHED, false)
@@ -68,7 +67,6 @@
6867
69AM_CONDITIONAL(BUILDING_GEARMAN, false)68AM_CONDITIONAL(BUILDING_GEARMAN, false)
70AM_CONDITIONAL(HAVE_LIBGEARMAN, false)69AM_CONDITIONAL(HAVE_LIBGEARMAN, false)
71AC_DEFINE([HAVE_LIBGEARMAN], [0], [Enables libgearman Support])
7270
73AC_SEARCH_LIBS(getopt_long, gnugetopt)71AC_SEARCH_LIBS(getopt_long, gnugetopt)
74AC_SEARCH_LIBS(gethostbyname, nsl)72AC_SEARCH_LIBS(gethostbyname, nsl)

Subscribers

People subscribed via source and target branches

to all changes: