← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to m4/libmemcached.m4

  • Committer: Monty Taylor
  • Date: 2008-11-19 08:43:19 UTC
  • mto: This revision was merged to the branch mainline in revision 590.
  • Revision ID: monty@inaugust.com-20081119084319-96uzptq7r2ci4ej9
Fixed the memcached function

Show diffs side-by-side

added added

removed removed

Lines of Context:
m4/libmemcached.m4
1
 
# Check to find libmemcached.
 
1
dnl Check to find libmemcached.
2
2
 
3
 
AC_DEFUN([AC_WITH_LIBMEMCACHED],[
 
3
AC_DEFUN([_SEARCH_FOR_LIBMEMCACHED],[
4
4
  AC_ARG_WITH(libmemcached,
5
 
    [AS_HELP_STRING([--with-libmemcached<:@=DIR@:>@],
 
5
    [AS_HELP_STRING([--with-libmemcached@<:@=DIR@:>@],
6
6
       [Use libmemcached in DIR])],
7
7
    [ with_libmemcached=$withval ],
8
8
    [ with_libmemcached=yes ])
9
9
 
10
 
  if test "$with_libmemcached" = "yes"],
 
10
  if test "$with_libmemcached" = "yes"
11
11
  then
12
12
    AC_CHECK_HEADERS(libmemcached/memcached.h)
13
13
    if test "$ac_cv_header_libmemcached_memcached_h" = "no"
16
16
    fi
17
17
    my_save_LIBS="$LIBS"
18
18
    LIBS=""
19
 
    AC_SEARCH_LIBS(libmemcached)
 
19
    AC_CHECK_LIB(memcached, memcached_quit, [ac_cv_found_libmemcached=yes], [ac_cv_found_libmemcached=no])
20
20
    LIBMEMCACED_LIBS="${LIBS}"
21
21
    LIBS="${my_save_LIBS}"
22
22
    LIBEVENT_CPPFLAGS=""
23
 
    if test "$ac_cv_header_libmemcached_memcached_h" = "yes" -a "$ac_cv_search_memcached" = "yes"
 
23
    if test "$ac_cv_header_libmemcached_memcached_h" = "yes" -a "$ac_cv_found_libmemcached" = "yes"
24
24
    then
25
25
      ac_cv_have_memcached=yes
26
26
    else
42
42
      LIBMEMCACHED_LIBS="-L$withval/lib -lmemcached"
43
43
      ac_cv_have_memcached=yes
44
44
    else
45
 
      AC_MSG_ERROR([event.h or libevent.a not found in $withval])
 
45
      AC_MSG_WARN([memcached.h or libmemcached.a not found in $withval])
 
46
      ac_cv_have_memcached=no
46
47
    fi
47
48
  fi
48
49
  AM_CONDITIONAL(HAVE_MEMCACHED,[test "$ac_cv_have_memcached" = "yes"])
49
50
])    
 
51
 
 
52
AC_DEFUN([AC_WITH_LIBMEMCACHED],[
 
53
  AC_REQUIRE([_SEARCH_FOR_LIBMEMCACHED])
 
54
])