Merge develop.

m4/acx_uuid.m4

@@ -133,8 +133,7 @@ AC_INCLUDES_DEFAULT])],[have_ossp_uuid_c_bindings=no],
 AC_INCLUDES_DEFAULT])],[have_ossp_uuid_c_bindings=no],[@%:@include <uuid.h>
 AC_INCLUDES_DEFAULT])
          CPPFLAGS=$acx_save_CPPFLAGS])],
-     [have_ossp_uuid_c_bindings=no], [@%:@include <uuid.h>
-AC_INCLUDES_DEFAULT])
+     [have_ossp_uuid_c_bindings=no])
    # check for DCE uuid_create if util-linux and OSSP variants cannot be found
    AS_IF([test x"$enable_dce_uuid" != xno -a x"$have_util_linux_uuid_c_bindings$have_ossp_uuid_c_bindings" = xnono],
      [ACX_C_PACKAGE([dce-uuid],[uuid.h],,,[],