components/libmemcached/patches/03-fix-memcached-m4-issue.patch

   1 --- libmemcached-1.0.17/m4/ax_memcached.m4  2013-02-20 23:58:10 +0000
   2 +++ libmemcached-1.0.17/m4/ax_memcached.m4  2013-04-11 07:22:14 +0000
   3 @@ -44,15 +44,26 @@
   4  #  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
   5  #  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   6
   7 -#serial 3
   8 +#serial 4
   9
  10  AC_DEFUN([AX_PROG_MEMCACHED],
  11 -    [AX_WITH_PROG([MEMCACHED_BINARY],[memcached])
  12 -    AS_IF([test -f "$ac_cv_path_MEMCACHED_BINARY"],
  13 -      [AC_DEFINE([HAVE_MEMCACHED_BINARY], [1], [If Memcached binary is available])
  14 -      AC_DEFINE_UNQUOTED([MEMCACHED_BINARY],"$ac_cv_path_MEMCACHED_BINARY",[Name of the memcached binary used in make test])
  15 -      ax_memcached_version=`$MEMCACHED_BINARY -h | sed 1q | awk '{print \$ 2 }' | sed 's|[\-a-z0-9]*$||' | awk -F. '{printf "%d.%d.%d", $[]1, $[]2, $[]3}'`
  16 -      AC_MSG_RESULT([memcached version "$ax_memcached_version"])
  17 -      AC_DEFINE_UNQUOTED([MEMCACHED_VERSION],"$ax_memcached_version",[Memcached binary version])
  18 -      ])
  19 -    ])
  20 +         [AX_WITH_PROG([MEMCACHED_BINARY],[memcached],[unknown])
  21 +         ax_memcached_success=
  22 +         AS_IF([test x"$MEMCACHED_BINARY" != xunknown],
  23 +               [AS_IF([test -x "$MEMCACHED_BINARY"],
  24 +                      [ax_memcached_version=`$MEMCACHED_BINARY -h | sed 1q | awk '{print \$ 2 }' | sed 's|[\-a-z0-9]*$||' | awk -F. '{printf "%d.%d.%d", $[]1, $[]2, $[]3}'`
  25 +                      AS_IF([test -n "$ax_memcached_version"],
  26 +                            [ax_memcached_success='ok'
  27 +                            AC_MSG_RESULT([memcached version "$ax_memcached_version"])
  28 +                            AC_DEFINE_UNQUOTED([MEMCACHED_VERSION],"$ax_memcached_version",[Memcached binary version])])
  29 +                      ])
  30 +               ])
  31 +
  32 +         AS_IF([test -n "$ax_memcached_success"],
  33 +               [AC_DEFINE([HAVE_MEMCACHED_BINARY], [1], [If Memcached binary is available])
  34 +               AC_DEFINE_UNQUOTED([MEMCACHED_BINARY],"$MEMCACHED_BINARY",[Name of the memcached binary used in make test])
  35 +               ],
  36 +               [AC_DEFINE([HAVE_MEMCACHED_BINARY], [0], [If Memcached binary is available])
  37 +               MEMCACHED_BINARY=
  38 +               ])
  39 +         ])