#2775 refs[t:2775] conditionally include tokutek enhancements in the handlerton

git-svn-id: file:///svn/mysql/tokudb-engine/tokudb-engine@21774 c7de825b-a66e-492c-adef-691d508d4ae1

#2775 refs[t:2775] conditionally include tokutek enhancements in the handlerton
git-svn-id: file:///svn/mysql/tokudb-engine/tokudb-engine@21774 c7de825b-a66e-492c-adef-691d508d4ae1
b2db2138 · Rich Prohaska · Yoni Fogel · ee854d93 · b2db2138 · b2db2138
Commit b2db2138 authored Jul 02, 2010 by Rich Prohaska Committed by Yoni Fogel Apr 17, 2013
Showing with 138 additions and 211 deletions

storage/tokudb/Makefile.in storage/tokudb/Makefile.in +132 -209

storage/tokudb/ha_tokudb.h storage/tokudb/ha_tokudb.h +4 -0

storage/tokudb/hatoku_hton.cc storage/tokudb/hatoku_hton.cc +2 -2

No files found.
--- a/storage/tokudb/Makefile.in
+++ b/storage/tokudb/Makefile.in
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# 2003, 2004, 2005  Free Software Foundation, Inc.
-# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -19,12 +18,15 @@
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -60,14 +62,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/include/config.h
 CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
 LIBRARIES = $(noinst_LIBRARIES)
-AM_V_AR = $(am__v_AR_$(V))
-am__v_AR_ = $(am__v_AR_$(AM_DEFAULT_VERBOSITY))
-am__v_AR_0 = @echo "  AR    " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
-am__v_at_0 = @
 libtokudb_a_AR = $(AR) $(ARFLAGS)
 libtokudb_a_LIBADD =
 am_libtokudb_a_OBJECTS = libtokudb_a-hatoku_hton.$(OBJEXT) \
@@ -79,57 +74,25 @@ am__vpath_adj = case $$p in \
    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
    *) f=$$p;; \
  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__installdirs = "$(DESTDIR)$(pkgplugindir)"
+pkgpluginLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(pkgplugin_LTLIBRARIES)
 ha_tokudb_la_DEPENDENCIES =
 am_ha_tokudb_la_OBJECTS = ha_tokudb_la-hatoku_hton.lo \
 	ha_tokudb_la-hatoku_cmp.lo ha_tokudb_la-ha_tokudb.lo
 ha_tokudb_la_OBJECTS = $(am_ha_tokudb_la_OBJECTS)
-AM_V_lt = $(am__v_lt_$(V))
+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include
-am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
-am__v_lt_0 = --silent
-ha_tokudb_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(ha_tokudb_la_CXXFLAGS) \
-	$(CXXFLAGS) $(ha_tokudb_la_LDFLAGS) $(LDFLAGS) -o $@
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
-am__mv = mv -f
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \
 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
 	$(AM_CXXFLAGS) $(CXXFLAGS)
-AM_V_CXX = $(am__v_CXX_$(V))
-am__v_CXX_ = $(am__v_CXX_$(AM_DEFAULT_VERBOSITY))
-am__v_CXX_0 = @echo "  CXX   " $@;
 CXXLD = $(CXX)
-CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CXXLD = $(am__v_CXXLD_$(V))
-am__v_CXXLD_ = $(am__v_CXXLD_$(AM_DEFAULT_VERBOSITY))
-am__v_CXXLD_0 = @echo "  CXXLD " $@;
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
-am__v_GEN_0 = @echo "  GEN   " $@;
 SOURCES = $(libtokudb_a_SOURCES) $(ha_tokudb_la_SOURCES)
 DIST_SOURCES = $(libtokudb_a_SOURCES) $(ha_tokudb_la_SOURCES)
 HEADERS = $(noinst_HEADERS)
@@ -139,20 +102,30 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ABI_CHECK = @ABI_CHECK@
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 ARFLAGS = @ARFLAGS@
 AS = @AS@
 ASFLAGS = @ASFLAGS@
+ASSEMBLER_FALSE = @ASSEMBLER_FALSE@
+ASSEMBLER_TRUE = @ASSEMBLER_TRUE@
+ASSEMBLER_sparc32_FALSE = @ASSEMBLER_sparc32_FALSE@
+ASSEMBLER_sparc32_TRUE = @ASSEMBLER_sparc32_TRUE@
+ASSEMBLER_sparc64_FALSE = @ASSEMBLER_sparc64_FALSE@
+ASSEMBLER_sparc64_TRUE = @ASSEMBLER_sparc64_TRUE@
+ASSEMBLER_x86_FALSE = @ASSEMBLER_x86_FALSE@
+ASSEMBLER_x86_TRUE = @ASSEMBLER_x86_TRUE@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AVAILABLE_LANGUAGES = @AVAILABLE_LANGUAGES@
 AWK = @AWK@
+BUILD_INNODB_TOOLS_FALSE = @BUILD_INNODB_TOOLS_FALSE@
+BUILD_INNODB_TOOLS_TRUE = @BUILD_INNODB_TOOLS_TRUE@
 CC = @CC@
 CCAS = @CCAS@
-CCASDEPMODE = @CCASDEPMODE@
 CCASFLAGS = @CCASFLAGS@
 CCDEPMODE = @CCDEPMODE@
 CC_VERSION = @CC_VERSION@
@@ -175,27 +148,32 @@ CXXFLAGS = @CXXFLAGS@
 CXXLDFLAGS = @CXXLDFLAGS@
 CXX_VERSION = @CXX_VERSION@
 CYGPATH_W = @CYGPATH_W@
+DARWIN_MWCC_FALSE = @DARWIN_MWCC_FALSE@
+DARWIN_MWCC_TRUE = @DARWIN_MWCC_TRUE@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DIFF = @DIFF@
 DOT_FRM_VERSION = @DOT_FRM_VERSION@
 DOXYGEN = @DOXYGEN@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
 DVIS = @DVIS@
+ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-FGREP = @FGREP@
+F77 = @F77@
+FFLAGS = @FFLAGS@
 FIND_PROC = @FIND_PROC@
 GETCONF = @GETCONF@
 GREP = @GREP@
 GXX = @GXX@
+HAVE_NETWARE_FALSE = @HAVE_NETWARE_FALSE@
+HAVE_NETWARE_TRUE = @HAVE_NETWARE_TRUE@
+HAVE_YASSL_FALSE = @HAVE_YASSL_FALSE@
+HAVE_YASSL_TRUE = @HAVE_YASSL_TRUE@
 HOSTNAME = @HOSTNAME@
 INNODB_DYNAMIC_CFLAGS = @INNODB_DYNAMIC_CFLAGS@
-INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -210,7 +188,6 @@ LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
 LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-LIPO = @LIPO@
 LM_CFLAGS = @LM_CFLAGS@
 LN = @LN@
 LN_CP_F = @LN_CP_F@
@@ -221,7 +198,6 @@ MAKEINDEX = @MAKEINDEX@
 MAKEINFO = @MAKEINFO@
 MAKE_BINARY_DISTRIBUTION_OPTIONS = @MAKE_BINARY_DISTRIBUTION_OPTIONS@
 MAKE_SHELL = @MAKE_SHELL@
-MKDIR_P = @MKDIR_P@
 MV = @MV@
 MYSQLD_DEFAULT_SWITCHES = @MYSQLD_DEFAULT_SWITCHES@
 MYSQLD_EXTRA_LDFLAGS = @MYSQLD_EXTRA_LDFLAGS@
@@ -253,20 +229,17 @@ NDB_VERSION_BUILD = @NDB_VERSION_BUILD@
 NDB_VERSION_MAJOR = @NDB_VERSION_MAJOR@
 NDB_VERSION_MINOR = @NDB_VERSION_MINOR@
 NDB_VERSION_STATUS = @NDB_VERSION_STATUS@
+NEED_THREAD_FALSE = @NEED_THREAD_FALSE@
+NEED_THREAD_TRUE = @NEED_THREAD_TRUE@
 NM = @NM@
-NMEDIT = @NMEDIT@
 NOINST_LDFLAGS = @NOINST_LDFLAGS@
 NON_THREADED_LIBS = @NON_THREADED_LIBS@
-OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PDFLATEX = @PDFLATEX@
@@ -297,19 +270,21 @@ TARGET_LINUX = @TARGET_LINUX@
 TERMCAP_LIB = @TERMCAP_LIB@
 TEST_NDBCLUSTER = @TEST_NDBCLUSTER@
 THREAD_LOBJECTS = @THREAD_LOBJECTS@
+THREAD_SAFE_CLIENT_FALSE = @THREAD_SAFE_CLIENT_FALSE@
+THREAD_SAFE_CLIENT_TRUE = @THREAD_SAFE_CLIENT_TRUE@
 VERSION = @VERSION@
 WRAPLIBS = @WRAPLIBS@
 YACC = @YACC@
 ZLIB_DEPS = @ZLIB_DEPS@
 ZLIB_INCLUDES = @ZLIB_INCLUDES@
 ZLIB_LIBS = @ZLIB_LIBS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+ac_ct_F77 = @ac_ct_F77@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -321,7 +296,6 @@ build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
-builddir = @builddir@
 condition_dependent_plugin_includes = @condition_dependent_plugin_includes@
 condition_dependent_plugin_links = @condition_dependent_plugin_links@
 condition_dependent_plugin_modules = @condition_dependent_plugin_modules@
@@ -348,7 +322,6 @@ libexecdir = @libexecdir@
 libmysqld_dirs = @libmysqld_dirs@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 man1_files = @man1_files@
 man8_files = @man8_files@
 man_dirs = @man_dirs@
@@ -422,7 +395,6 @@ sql_client_dirs = @sql_client_dirs@
 sql_server = @sql_server@
 sql_server_dirs = @sql_server_dirs@
 sql_union_dirs = @sql_union_dirs@
-srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
@@ -430,9 +402,6 @@ target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
 tools_dirs = @tools_dirs@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
 uname_prog = @uname_prog@
 yassl_dir = @yassl_dir@
 yassl_h_ln_cmd = @yassl_h_ln_cmd@
@@ -472,14 +441,14 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
+		&& exit 0; \
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu storage/tokudb/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  storage/tokudb/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
+	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu storage/tokudb/Makefile
+	  $(AUTOMAKE) --gnu  storage/tokudb/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -497,35 +466,30 @@ $(top_srcdir)/configure:  $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
 clean-noinstLIBRARIES:
 	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
 libtokudb.a: $(libtokudb_a_OBJECTS) $(libtokudb_a_DEPENDENCIES) 
-	$(AM_V_at)-rm -f libtokudb.a
+	-rm -f libtokudb.a
-	$(AM_V_AR)$(libtokudb_a_AR) libtokudb.a $(libtokudb_a_OBJECTS) $(libtokudb_a_LIBADD)
+	$(libtokudb_a_AR) libtokudb.a $(libtokudb_a_OBJECTS) $(libtokudb_a_LIBADD)
-	$(AM_V_at)$(RANLIB) libtokudb.a
+	$(RANLIB) libtokudb.a
 install-pkgpluginLTLIBRARIES: $(pkgplugin_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(pkgplugindir)" || $(MKDIR_P) "$(DESTDIR)$(pkgplugindir)"
+	test -z "$(pkgplugindir)" || $(mkdir_p) "$(DESTDIR)$(pkgplugindir)"
-	@list='$(pkgplugin_LTLIBRARIES)'; test -n "$(pkgplugindir)" || list=; \
+	@list='$(pkgplugin_LTLIBRARIES)'; for p in $$list; do \
-	list2=; for p in $$list; do \
 	  if test -f $$p; then \
-	    list2="$$list2 $$p"; \
+	    f=$(am__strip_dir) \
+	    echo " $(LIBTOOL) --mode=install $(pkgpluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(pkgplugindir)/$$f'"; \
+	    $(LIBTOOL) --mode=install $(pkgpluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(pkgplugindir)/$$f"; \
 	  else :; fi; \
-	done; \
+	done
-	test -z "$$list2" || { \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkgplugindir)'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkgplugindir)"; \
-	}
 uninstall-pkgpluginLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@list='$(pkgplugin_LTLIBRARIES)'; test -n "$(pkgplugindir)" || list=; \
+	@set -x; list='$(pkgplugin_LTLIBRARIES)'; for p in $$list; do \
-	for p in $$list; do \
+	  p=$(am__strip_dir) \
-	  $(am__strip_dir) \
+	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(pkgplugindir)/$$p'"; \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(pkgplugindir)/$$f'"; \
+	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(pkgplugindir)/$$p"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(pkgplugindir)/$$f"; \
 	done
 clean-pkgpluginLTLIBRARIES:
@@ -537,7 +501,7 @@ clean-pkgpluginLTLIBRARIES:
 	  rm -f "$${dir}/so_locations"; \
 	done
 ha_tokudb.la: $(ha_tokudb_la_OBJECTS) $(ha_tokudb_la_DEPENDENCIES) 
-	$(AM_V_CXXLD)$(ha_tokudb_la_LINK)  $(ha_tokudb_la_OBJECTS) $(ha_tokudb_la_LIBADD) $(LIBS)
+	$(CXXLINK)  $(ha_tokudb_la_LDFLAGS) $(ha_tokudb_la_OBJECTS) $(ha_tokudb_la_LIBADD) $(LIBS)
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -553,100 +517,88 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtokudb_a-hatoku_hton.Po@am__quote@
 .cc.o:
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 .cc.obj:
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 .cc.lo:
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
 libtokudb_a-hatoku_hton.o: hatoku_hton.cc
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtokudb_a_CXXFLAGS) $(CXXFLAGS) -MT libtokudb_a-hatoku_hton.o -MD -MP -MF $(DEPDIR)/libtokudb_a-hatoku_hton.Tpo -c -o libtokudb_a-hatoku_hton.o `test -f 'hatoku_hton.cc' || echo '$(srcdir)/'`hatoku_hton.cc
+@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtokudb_a_CXXFLAGS) $(CXXFLAGS) -MT libtokudb_a-hatoku_hton.o -MD -MP -MF "$(DEPDIR)/libtokudb_a-hatoku_hton.Tpo" -c -o libtokudb_a-hatoku_hton.o `test -f 'hatoku_hton.cc' || echo '$(srcdir)/'`hatoku_hton.cc; \
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libtokudb_a-hatoku_hton.Tpo $(DEPDIR)/libtokudb_a-hatoku_hton.Po
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/libtokudb_a-hatoku_hton.Tpo" "$(DEPDIR)/libtokudb_a-hatoku_hton.Po"; else rm -f "$(DEPDIR)/libtokudb_a-hatoku_hton.Tpo"; exit 1; fi
-@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='hatoku_hton.cc' object='libtokudb_a-hatoku_hton.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtokudb_a_CXXFLAGS) $(CXXFLAGS) -c -o libtokudb_a-hatoku_hton.o `test -f 'hatoku_hton.cc' || echo '$(srcdir)/'`hatoku_hton.cc
 libtokudb_a-hatoku_hton.obj: hatoku_hton.cc
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtokudb_a_CXXFLAGS) $(CXXFLAGS) -MT libtokudb_a-hatoku_hton.obj -MD -MP -MF $(DEPDIR)/libtokudb_a-hatoku_hton.Tpo -c -o libtokudb_a-hatoku_hton.obj `if test -f 'hatoku_hton.cc'; then $(CYGPATH_W) 'hatoku_hton.cc'; else $(CYGPATH_W) '$(srcdir)/hatoku_hton.cc'; fi`
+@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtokudb_a_CXXFLAGS) $(CXXFLAGS) -MT libtokudb_a-hatoku_hton.obj -MD -MP -MF "$(DEPDIR)/libtokudb_a-hatoku_hton.Tpo" -c -o libtokudb_a-hatoku_hton.obj `if test -f 'hatoku_hton.cc'; then $(CYGPATH_W) 'hatoku_hton.cc'; else $(CYGPATH_W) '$(srcdir)/hatoku_hton.cc'; fi`; \
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libtokudb_a-hatoku_hton.Tpo $(DEPDIR)/libtokudb_a-hatoku_hton.Po
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/libtokudb_a-hatoku_hton.Tpo" "$(DEPDIR)/libtokudb_a-hatoku_hton.Po"; else rm -f "$(DEPDIR)/libtokudb_a-hatoku_hton.Tpo"; exit 1; fi
-@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='hatoku_hton.cc' object='libtokudb_a-hatoku_hton.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtokudb_a_CXXFLAGS) $(CXXFLAGS) -c -o libtokudb_a-hatoku_hton.obj `if test -f 'hatoku_hton.cc'; then $(CYGPATH_W) 'hatoku_hton.cc'; else $(CYGPATH_W) '$(srcdir)/hatoku_hton.cc'; fi`
 libtokudb_a-hatoku_cmp.o: hatoku_cmp.cc
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtokudb_a_CXXFLAGS) $(CXXFLAGS) -MT libtokudb_a-hatoku_cmp.o -MD -MP -MF $(DEPDIR)/libtokudb_a-hatoku_cmp.Tpo -c -o libtokudb_a-hatoku_cmp.o `test -f 'hatoku_cmp.cc' || echo '$(srcdir)/'`hatoku_cmp.cc
+@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtokudb_a_CXXFLAGS) $(CXXFLAGS) -MT libtokudb_a-hatoku_cmp.o -MD -MP -MF "$(DEPDIR)/libtokudb_a-hatoku_cmp.Tpo" -c -o libtokudb_a-hatoku_cmp.o `test -f 'hatoku_cmp.cc' || echo '$(srcdir)/'`hatoku_cmp.cc; \
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libtokudb_a-hatoku_cmp.Tpo $(DEPDIR)/libtokudb_a-hatoku_cmp.Po
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/libtokudb_a-hatoku_cmp.Tpo" "$(DEPDIR)/libtokudb_a-hatoku_cmp.Po"; else rm -f "$(DEPDIR)/libtokudb_a-hatoku_cmp.Tpo"; exit 1; fi
-@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='hatoku_cmp.cc' object='libtokudb_a-hatoku_cmp.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtokudb_a_CXXFLAGS) $(CXXFLAGS) -c -o libtokudb_a-hatoku_cmp.o `test -f 'hatoku_cmp.cc' || echo '$(srcdir)/'`hatoku_cmp.cc
 libtokudb_a-hatoku_cmp.obj: hatoku_cmp.cc
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtokudb_a_CXXFLAGS) $(CXXFLAGS) -MT libtokudb_a-hatoku_cmp.obj -MD -MP -MF $(DEPDIR)/libtokudb_a-hatoku_cmp.Tpo -c -o libtokudb_a-hatoku_cmp.obj `if test -f 'hatoku_cmp.cc'; then $(CYGPATH_W) 'hatoku_cmp.cc'; else $(CYGPATH_W) '$(srcdir)/hatoku_cmp.cc'; fi`
+@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtokudb_a_CXXFLAGS) $(CXXFLAGS) -MT libtokudb_a-hatoku_cmp.obj -MD -MP -MF "$(DEPDIR)/libtokudb_a-hatoku_cmp.Tpo" -c -o libtokudb_a-hatoku_cmp.obj `if test -f 'hatoku_cmp.cc'; then $(CYGPATH_W) 'hatoku_cmp.cc'; else $(CYGPATH_W) '$(srcdir)/hatoku_cmp.cc'; fi`; \
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libtokudb_a-hatoku_cmp.Tpo $(DEPDIR)/libtokudb_a-hatoku_cmp.Po
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/libtokudb_a-hatoku_cmp.Tpo" "$(DEPDIR)/libtokudb_a-hatoku_cmp.Po"; else rm -f "$(DEPDIR)/libtokudb_a-hatoku_cmp.Tpo"; exit 1; fi
-@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='hatoku_cmp.cc' object='libtokudb_a-hatoku_cmp.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtokudb_a_CXXFLAGS) $(CXXFLAGS) -c -o libtokudb_a-hatoku_cmp.obj `if test -f 'hatoku_cmp.cc'; then $(CYGPATH_W) 'hatoku_cmp.cc'; else $(CYGPATH_W) '$(srcdir)/hatoku_cmp.cc'; fi`
 libtokudb_a-ha_tokudb.o: ha_tokudb.cc
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtokudb_a_CXXFLAGS) $(CXXFLAGS) -MT libtokudb_a-ha_tokudb.o -MD -MP -MF $(DEPDIR)/libtokudb_a-ha_tokudb.Tpo -c -o libtokudb_a-ha_tokudb.o `test -f 'ha_tokudb.cc' || echo '$(srcdir)/'`ha_tokudb.cc
+@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtokudb_a_CXXFLAGS) $(CXXFLAGS) -MT libtokudb_a-ha_tokudb.o -MD -MP -MF "$(DEPDIR)/libtokudb_a-ha_tokudb.Tpo" -c -o libtokudb_a-ha_tokudb.o `test -f 'ha_tokudb.cc' || echo '$(srcdir)/'`ha_tokudb.cc; \
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libtokudb_a-ha_tokudb.Tpo $(DEPDIR)/libtokudb_a-ha_tokudb.Po
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/libtokudb_a-ha_tokudb.Tpo" "$(DEPDIR)/libtokudb_a-ha_tokudb.Po"; else rm -f "$(DEPDIR)/libtokudb_a-ha_tokudb.Tpo"; exit 1; fi
-@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='ha_tokudb.cc' object='libtokudb_a-ha_tokudb.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtokudb_a_CXXFLAGS) $(CXXFLAGS) -c -o libtokudb_a-ha_tokudb.o `test -f 'ha_tokudb.cc' || echo '$(srcdir)/'`ha_tokudb.cc
 libtokudb_a-ha_tokudb.obj: ha_tokudb.cc
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtokudb_a_CXXFLAGS) $(CXXFLAGS) -MT libtokudb_a-ha_tokudb.obj -MD -MP -MF $(DEPDIR)/libtokudb_a-ha_tokudb.Tpo -c -o libtokudb_a-ha_tokudb.obj `if test -f 'ha_tokudb.cc'; then $(CYGPATH_W) 'ha_tokudb.cc'; else $(CYGPATH_W) '$(srcdir)/ha_tokudb.cc'; fi`
+@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtokudb_a_CXXFLAGS) $(CXXFLAGS) -MT libtokudb_a-ha_tokudb.obj -MD -MP -MF "$(DEPDIR)/libtokudb_a-ha_tokudb.Tpo" -c -o libtokudb_a-ha_tokudb.obj `if test -f 'ha_tokudb.cc'; then $(CYGPATH_W) 'ha_tokudb.cc'; else $(CYGPATH_W) '$(srcdir)/ha_tokudb.cc'; fi`; \
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libtokudb_a-ha_tokudb.Tpo $(DEPDIR)/libtokudb_a-ha_tokudb.Po
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/libtokudb_a-ha_tokudb.Tpo" "$(DEPDIR)/libtokudb_a-ha_tokudb.Po"; else rm -f "$(DEPDIR)/libtokudb_a-ha_tokudb.Tpo"; exit 1; fi
-@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='ha_tokudb.cc' object='libtokudb_a-ha_tokudb.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtokudb_a_CXXFLAGS) $(CXXFLAGS) -c -o libtokudb_a-ha_tokudb.obj `if test -f 'ha_tokudb.cc'; then $(CYGPATH_W) 'ha_tokudb.cc'; else $(CYGPATH_W) '$(srcdir)/ha_tokudb.cc'; fi`
 ha_tokudb_la-hatoku_hton.lo: hatoku_hton.cc
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ha_tokudb_la_CXXFLAGS) $(CXXFLAGS) -MT ha_tokudb_la-hatoku_hton.lo -MD -MP -MF $(DEPDIR)/ha_tokudb_la-hatoku_hton.Tpo -c -o ha_tokudb_la-hatoku_hton.lo `test -f 'hatoku_hton.cc' || echo '$(srcdir)/'`hatoku_hton.cc
+@am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ha_tokudb_la_CXXFLAGS) $(CXXFLAGS) -MT ha_tokudb_la-hatoku_hton.lo -MD -MP -MF "$(DEPDIR)/ha_tokudb_la-hatoku_hton.Tpo" -c -o ha_tokudb_la-hatoku_hton.lo `test -f 'hatoku_hton.cc' || echo '$(srcdir)/'`hatoku_hton.cc; \
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ha_tokudb_la-hatoku_hton.Tpo $(DEPDIR)/ha_tokudb_la-hatoku_hton.Plo
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/ha_tokudb_la-hatoku_hton.Tpo" "$(DEPDIR)/ha_tokudb_la-hatoku_hton.Plo"; else rm -f "$(DEPDIR)/ha_tokudb_la-hatoku_hton.Tpo"; exit 1; fi
-@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='hatoku_hton.cc' object='ha_tokudb_la-hatoku_hton.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ha_tokudb_la_CXXFLAGS) $(CXXFLAGS) -c -o ha_tokudb_la-hatoku_hton.lo `test -f 'hatoku_hton.cc' || echo '$(srcdir)/'`hatoku_hton.cc
+@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ha_tokudb_la_CXXFLAGS) $(CXXFLAGS) -c -o ha_tokudb_la-hatoku_hton.lo `test -f 'hatoku_hton.cc' || echo '$(srcdir)/'`hatoku_hton.cc
 ha_tokudb_la-hatoku_cmp.lo: hatoku_cmp.cc
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ha_tokudb_la_CXXFLAGS) $(CXXFLAGS) -MT ha_tokudb_la-hatoku_cmp.lo -MD -MP -MF $(DEPDIR)/ha_tokudb_la-hatoku_cmp.Tpo -c -o ha_tokudb_la-hatoku_cmp.lo `test -f 'hatoku_cmp.cc' || echo '$(srcdir)/'`hatoku_cmp.cc
+@am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ha_tokudb_la_CXXFLAGS) $(CXXFLAGS) -MT ha_tokudb_la-hatoku_cmp.lo -MD -MP -MF "$(DEPDIR)/ha_tokudb_la-hatoku_cmp.Tpo" -c -o ha_tokudb_la-hatoku_cmp.lo `test -f 'hatoku_cmp.cc' || echo '$(srcdir)/'`hatoku_cmp.cc; \
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ha_tokudb_la-hatoku_cmp.Tpo $(DEPDIR)/ha_tokudb_la-hatoku_cmp.Plo
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/ha_tokudb_la-hatoku_cmp.Tpo" "$(DEPDIR)/ha_tokudb_la-hatoku_cmp.Plo"; else rm -f "$(DEPDIR)/ha_tokudb_la-hatoku_cmp.Tpo"; exit 1; fi
-@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='hatoku_cmp.cc' object='ha_tokudb_la-hatoku_cmp.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ha_tokudb_la_CXXFLAGS) $(CXXFLAGS) -c -o ha_tokudb_la-hatoku_cmp.lo `test -f 'hatoku_cmp.cc' || echo '$(srcdir)/'`hatoku_cmp.cc
+@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ha_tokudb_la_CXXFLAGS) $(CXXFLAGS) -c -o ha_tokudb_la-hatoku_cmp.lo `test -f 'hatoku_cmp.cc' || echo '$(srcdir)/'`hatoku_cmp.cc
 ha_tokudb_la-ha_tokudb.lo: ha_tokudb.cc
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ha_tokudb_la_CXXFLAGS) $(CXXFLAGS) -MT ha_tokudb_la-ha_tokudb.lo -MD -MP -MF $(DEPDIR)/ha_tokudb_la-ha_tokudb.Tpo -c -o ha_tokudb_la-ha_tokudb.lo `test -f 'ha_tokudb.cc' || echo '$(srcdir)/'`ha_tokudb.cc
+@am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ha_tokudb_la_CXXFLAGS) $(CXXFLAGS) -MT ha_tokudb_la-ha_tokudb.lo -MD -MP -MF "$(DEPDIR)/ha_tokudb_la-ha_tokudb.Tpo" -c -o ha_tokudb_la-ha_tokudb.lo `test -f 'ha_tokudb.cc' || echo '$(srcdir)/'`ha_tokudb.cc; \
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ha_tokudb_la-ha_tokudb.Tpo $(DEPDIR)/ha_tokudb_la-ha_tokudb.Plo
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/ha_tokudb_la-ha_tokudb.Tpo" "$(DEPDIR)/ha_tokudb_la-ha_tokudb.Plo"; else rm -f "$(DEPDIR)/ha_tokudb_la-ha_tokudb.Tpo"; exit 1; fi
-@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='ha_tokudb.cc' object='ha_tokudb_la-ha_tokudb.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ha_tokudb_la_CXXFLAGS) $(CXXFLAGS) -c -o ha_tokudb_la-ha_tokudb.lo `test -f 'ha_tokudb.cc' || echo '$(srcdir)/'`ha_tokudb.cc
+@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ha_tokudb_la_CXXFLAGS) $(CXXFLAGS) -c -o ha_tokudb_la-ha_tokudb.lo `test -f 'ha_tokudb.cc' || echo '$(srcdir)/'`ha_tokudb.cc
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -654,85 +606,82 @@ mostlyclean-libtool:
 clean-libtool:
 	-rm -rf .libs _libs
+distclean-libtool:
+	-rm -f libtool
+uninstall-info-am:
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	  $(AWK) '    { files[$$0] = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	set x; \
+	tags=; \
 	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	  $(AWK) '    { files[$$0] = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	       END { for (i in files) print i; }'`; \
-	shift; \
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
 	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	  $(AWK) '    { files[$$0] = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	       END { for (i in files) print i; }'`; \
-	test -z "$(CTAGS_ARGS)$$unique" \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
+	     $$tags $$unique
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(am__cd) $(top_srcdir) \
+	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) "$$here"
+	  && gtags -i $(GTAGS_ARGS) $$here
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; \
+	list='$(DISTFILES)'; for file in $$list; do \
-	  dist_files=`for file in $$list; do echo $$file; done | \
+	  case $$file in \
-	  sed -e "s|^$$srcdirstrip/||;t" \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	case $$dist_files in \
+	  esac; \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
 	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
 	  else \
-	    test -f "$(distdir)/$$file" \
+	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || cp -p $$d/$$file $(distdir)/$$file \
 	    || exit 1; \
 	  fi; \
 	done
@@ -741,7 +690,7 @@ check: check-am
 all-am: Makefile $(LIBRARIES) $(LTLIBRARIES) $(HEADERS)
 installdirs:
 	for dir in "$(DESTDIR)$(pkgplugindir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -763,7 +712,6 @@ clean-generic:
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -777,7 +725,7 @@ distclean: distclean-am
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-tags
+	distclean-libtool distclean-tags
 dvi: dvi-am
@@ -785,38 +733,18 @@ dvi-am:
 html: html-am
-html-am:
 info: info-am
 info-am:
 install-data-am: install-pkgpluginLTLIBRARIES
-install-dvi: install-dvi-am
-install-dvi-am:
 install-exec-am:
-install-html: install-html-am
-install-html-am:
 install-info: install-info-am
-install-info-am:
 install-man:
-install-pdf: install-pdf-am
-install-pdf-am:
-install-ps: install-ps-am
-install-ps-am:
 installcheck-am:
 maintainer-clean: maintainer-clean-am
@@ -837,28 +765,23 @@ ps: ps-am
 ps-am:
-uninstall-am: uninstall-pkgpluginLTLIBRARIES
+uninstall-am: uninstall-info-am uninstall-pkgpluginLTLIBRARIES
-.MAKE: install-am install-strip
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-libtool clean-noinstLIBRARIES clean-pkgpluginLTLIBRARIES \
 	ctags distclean distclean-compile distclean-generic \
 	distclean-libtool distclean-tags distdir dvi dvi-am html \
 	html-am info info-am install install-am install-data \
-	install-data-am install-dvi install-dvi-am install-exec \
+	install-data-am install-exec install-exec-am install-info \
-	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pkgpluginLTLIBRARIES \
-	install-info-am install-man install-pdf install-pdf-am \
-	install-pkgpluginLTLIBRARIES install-ps install-ps-am \
 	install-strip installcheck installcheck-am installdirs \
 	maintainer-clean maintainer-clean-generic mostlyclean \
 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
 	pdf pdf-am ps ps-am tags uninstall uninstall-am \
-	uninstall-pkgpluginLTLIBRARIES
+	uninstall-info-am uninstall-pkgpluginLTLIBRARIES
 # Don't update the files from bitkeeper
 %::SCCS/s.%
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
--- a/storage/tokudb/ha_tokudb.h
+++ b/storage/tokudb/ha_tokudb.h
@@ -2,6 +2,10 @@
 #pragma interface               /* gcc class implementation */
 #endif
+#define TOKU_INCLUDE_CHECKPOINT_LOCK 1
+#define TOKU_INCLUDE_SHOW_DATA_AMOUNT 1
 #if !defined(HA_CLUSTERING)
 #define HA_CLUSTERING 0
 #define HA_CLUSTERED_INDEX 0

--- a/storage/tokudb/hatoku_hton.cc
+++ b/storage/tokudb/hatoku_hton.cc
@@ -1147,7 +1147,7 @@ cleanup:
 bool tokudb_show_status(handlerton * hton, THD * thd, stat_print_fn * stat_print, enum ha_stat_type stat_type) {
    switch (stat_type) {
-#if defined(HA_ENGINE_DATA_AMOUNT)
+#if TOKU_INCLUDE_SHOW_DATA_AMOUNT
    case HA_ENGINE_DATA_AMOUNT:
        return tokudb_show_data_size(thd, stat_print, false);
        break;
@@ -1158,7 +1158,7 @@ bool tokudb_show_status(handlerton * hton, THD * thd, stat_print_fn * stat_print
    case HA_ENGINE_STATUS:
        return tokudb_show_engine_status(thd, stat_print);
        break;
-#if defined(HA_ENGINE_CHECKPOINT_LOCK)
+#if TOKU_INCLUDE_CHECKPOINT_LOCK
    case HA_ENGINE_CHECKPOINT_LOCK:
        return tokudb_checkpoint_lock(thd, stat_print);
        break;