Merge branch 'master' into ja/lua

diff --combined configure.in
index 3610f26,3b46188..5f99eaa
--- 1/configure.in
--- 2/configure.in
+++ b/configure.in
@@@ -574,13 -574,24 +574,24 @@@ AM_CONDITIONAL(BUILD_WITH_LIBSOCKET, te
  
  clock_gettime_needs_rt="no"
  clock_gettime_needs_posix4="no"
- AC_CHECK_FUNCS(clock_gettime,
-     [],
-     AC_CHECK_LIB(rt, clock_gettime,
-         [clock_gettime_needs_rt="yes"],
-         AC_CHECK_LIB(posix4, clock_gettime,
-             [clock_gettime_needs_posix4="yes"],
-             AC_MSG_ERROR(cannot find clock_gettime))))
+ have_clock_gettime="no"
+ AC_CHECK_FUNCS(clock_gettime, [have_clock_gettime="yes"])
+ if test "x$have_clock_gettime" = "xno"
+ then
+       AC_CHECK_LIB(rt, clock_gettime, [clock_gettime_needs_rt="yes"
+                                        have_clock_gettime="yes"])
+ fi
+ if test "x$have_clock_gettime" = "xno"
+ then
+       AC_CHECK_LIB(posix4, clock_gettime, [clock_gettime_needs_posix4="yes"
+                                            have_clock_gettime="yes"])
+ fi
+ if test "x$have_clock_gettime" = "xyes"
+ then
+       AC_DEFINE(HAVE_CLOCK_GETTIME, 1, [Define if the clock_gettime(2) function is available.])
+ else
+       AC_MSG_WARN(cannot find clock_gettime)
+ fi
  
  nanosleep_needs_rt="no"
  nanosleep_needs_posix4="no"
@@@ -1966,62 -1977,6 +1977,62 @@@ AC_SUBST(JAVA_LIBS
  AM_CONDITIONAL(BUILD_WITH_JAVA, test "x$with_java" = "xyes")
  # }}}
  
 +# --with-liblua {{{
 +with_liblua_cppflags=""
 +with_liblua_ldflags=""
 +with_liblua_libs=""
 +with_liblua="yes"
 +
 +if test "x$with_liblua" = "xyes"
 +then
 +      $PKG_CONFIG --exists lua5.1 2>/dev/null
 +      lua_config_status=$?
 +
 +      if test 0 -ne $lua_config_status
 +      then
 +              with_liblua="no"
 +      fi
 +fi
 +
 +if test "x$with_liblua" = "xyes"
 +then
 +      with_liblua_cppflags=`$PKG_CONFIG --cflags-only-I lua5.1` || with_liblua="no"
 +      with_liblua_ldflags=`$PKG_CONFIG --libs-only-L lua5.1` || with_liblua="no"
 +      with_liblua_libs=`$PKG_CONFIG --libs-only-l lua5.1` || with_liblua="no"
 +fi
 +if test "x$with_liblua" = "xyes"
 +then
 +      SAVE_CPPFLAGS="$CPPFLAGS"
 +      CPPFLAGS="$CPPFLAGS $with_liblua_cppflags"
 +
 +      AC_CHECK_HEADERS(lua.h lauxlib.h lualib.h, [], [with_liblua="no (header not found)"], [])
 +
 +      CPPFLAGS="$SAVE_CPPFLAGS"
 +fi
 +if test "x$with_liblua" = "xyes"
 +then
 +      SAVE_LDFLAGS="$LDFLAGS"
 +      SAVE_LIBS="$LIBS"
 +      LDFLAGS="$SAVE_LDFLAGS $with_liblua_ldflags"
 +      LIBS="$LIBS $with_liblua_libs"
 +
 +      AC_CHECK_FUNC(lua_settop, [with_liblua="yes"], [with_liblua="no (symbol 'lua_settop' not found)"])
 +
 +      LDFLAGS="$SAVE_LDFLAGS"
 +      LIBS="$SAVE_LIBS"
 +fi
 +if test "x$with_liblua" = "xyes"
 +then
 +    BUILD_WITH_LIBLUA_CPPFLAGS="$with_liblua_cppflags"
 +    BUILD_WITH_LIBLUA_LDFLAGS="$with_liblua_ldflags"
 +    BUILD_WITH_LIBLUA_LIBS="$with_liblua_libs"
 +    AC_SUBST(BUILD_WITH_LIBLUA_CPPFLAGS)
 +    AC_SUBST(BUILD_WITH_LIBLUA_LDFLAGS)
 +    AC_SUBST(BUILD_WITH_LIBLUA_LIBS)
 +fi
 +AM_CONDITIONAL(BUILD_WITH_LUA, test "x$with_liblua" = "xyes")
 +# }}}
 +
  # --with-libmemcached {{{
  with_libmemcached_cppflags=""
  with_libmemcached_ldflags=""
@@@ -4626,7 -4581,6 +4637,7 @@@ AC_PLUGIN([libvirt],     [$plugin_libvi
  AC_PLUGIN([load],        [$plugin_load],       [System load])
  AC_PLUGIN([logfile],     [yes],                [File logging plugin])
  AC_PLUGIN([lpar],        [$with_perfstat],     [AIX logical partitions statistics])
 +AC_PLUGIN([lua],         [$with_liblua],       [Lua plugin])
  AC_PLUGIN([madwifi],     [$have_linux_wireless_h], [Madwifi wireless statistics])
  AC_PLUGIN([match_empty_counter], [yes],        [The empty counter match])
  AC_PLUGIN([match_hashed], [yes],               [The hashed match])
@@@ -4877,7 -4831,6 +4888,7 @@@ Configuration
      libjvm  . . . . . . . $with_java
      libkstat  . . . . . . $with_kstat
      libkvm  . . . . . . . $with_libkvm
 +    liblua  . . . . . . . $with_liblua
      libmemcached  . . . . $with_libmemcached
      libmodbus . . . . . . $with_libmodbus
      libmysql  . . . . . . $with_libmysql
@@@ -4954,7 -4907,6 +4965,7 @@@
      load  . . . . . . . . $enable_load
      logfile . . . . . . . $enable_logfile
      lpar... . . . . . . . $enable_lpar
 +    lua . . . . . . . . . $enable_lua
      madwifi . . . . . . . $enable_madwifi
      match_empty_counter . $enable_match_empty_counter
      match_hashed  . . . . $enable_match_hashed