From 220ac91be6530bd992a7d2bde4310bb523075143 Mon Sep 17 00:00:00 2001 From: Brian Aker Date: Tue, 9 Oct 2012 02:39:13 -0400 Subject: [PATCH] Update ax_libmemcached.m4 --- m4/{ax_lib_libmemcached.m4 => ax_libmemcached.m4} | 8 ++++---- m4/include.am | 2 +- support/libmemcached.spec.in | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) rename m4/{ax_lib_libmemcached.m4 => ax_libmemcached.m4} (97%) diff --git a/m4/ax_lib_libmemcached.m4 b/m4/ax_libmemcached.m4 similarity index 97% rename from m4/ax_lib_libmemcached.m4 rename to m4/ax_libmemcached.m4 index 55db1eba..ea385d0f 100644 --- a/m4/ax_lib_libmemcached.m4 +++ b/m4/ax_libmemcached.m4 @@ -55,7 +55,7 @@ AC_DEFUN([AX_LIBMEMCACHED], [ AC_CHECK_HEADER([libmemcached-1.0/memcached.h], [ AC_CACHE_CHECK([check for -lmemcached], [ax_cv_libmemcached], [ AC_LANG_PUSH([C]) - save_LIBS="$LIBS" + AX_SAVE_FLAGS LIBS="-lmemcached $LIBS" AC_RUN_IFELSE([ AC_LANG_PROGRAM([#include ], [ @@ -67,7 +67,7 @@ AC_DEFUN([AX_LIBMEMCACHED], [ [ax_cv_libmemcached=no], [AC_MSG_WARN([test program execution failed])]) AC_LANG_POP - LIBS="$save_LIBS" + AX_RESTORE_FLAGS ]) ]) @@ -87,8 +87,8 @@ AC_DEFUN([AX_LIBMEMCACHED], [ AS_IF([test "$ax_cv_libmemcached" = yes], [ AC_CHECK_HEADER([libmemcachedutil-1.0/util.h], [ AC_CACHE_CHECK([check for -lmemcachedutil], [ax_cv_libmemcached_util], [ + AX_SAVE_FLAGS AC_LANG_PUSH([C]) - save_LIBS="$LIBS" LIBS="-lmemcachedutil -lmemcached $LIBS" AC_RUN_IFELSE([ AC_LANG_PROGRAM([#include ], [ @@ -99,7 +99,7 @@ AC_DEFUN([AX_LIBMEMCACHED], [ [ax_cv_libmemcached_util=no], [AC_MSG_WARN([test program execution failed])]) AC_LANG_POP - LIBS="$save_LIBS" + AX_RESTORE_FLAGS ]) ]) ]) diff --git a/m4/include.am b/m4/include.am index daede12b..3ad36861 100644 --- a/m4/include.am +++ b/m4/include.am @@ -3,4 +3,4 @@ # All paths should be given relative to the root -dist_aclocal_DATA+= m4/ax_lib_libmemcached.m4 +dist_aclocal_DATA+= m4/ax_libmemcached.m4 diff --git a/support/libmemcached.spec.in b/support/libmemcached.spec.in index a6ca62c3..6660ac5d 100644 --- a/support/libmemcached.spec.in +++ b/support/libmemcached.spec.in @@ -145,7 +145,7 @@ you will need to install %{name}-devel. %files devel %defattr (-,root,root,-) %doc examples -%{_datadir}/aclocal/ax_lib_libmemcached.m4 +%{_datadir}/aclocal/ax_libmemcached.m4 %{_includedir}/libhashkit/hashkit.h %{_includedir}/libhashkit-1.0/algorithm.h %{_includedir}/libhashkit-1.0/behavior.h -- 2.30.2