[t:2557], undo bad checkin of Makefile.am

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

storage/tokudb/Makefile.in

@@ -50,7 +50,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/ac-macros/alloca.m4 \
 	$(top_srcdir)/config/ac-macros/character_sets.m4 \
 	$(top_srcdir)/config/ac-macros/compiler_flag.m4 \
 	$(top_srcdir)/config/ac-macros/plugins.m4 \
-	$(top_srcdir)/config/ac-macros/dtrace.m4 \
 	$(top_srcdir)/config/ac-macros/ha_ndbcluster.m4 \
 	$(top_srcdir)/config/ac-macros/large_file.m4 \
 	$(top_srcdir)/config/ac-macros/misc.m4 \
@@ -156,8 +155,6 @@ DEPDIR = @DEPDIR@
 DIFF = @DIFF@
 DOT_FRM_VERSION = @DOT_FRM_VERSION@
 DOXYGEN = @DOXYGEN@
-DTRACE = @DTRACE@
-DTRACEFLAGS = @DTRACEFLAGS@
 DVIS = @DVIS@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
@@ -169,13 +166,7 @@ F77 = @F77@
 FFLAGS = @FFLAGS@
 FIND_PROC = @FIND_PROC@
 GETCONF = @GETCONF@
-GREP = @GREP@
 GXX = @GXX@
-HAVE_DTRACE = @HAVE_DTRACE@
-HAVE_DTRACE_DASH_G_FALSE = @HAVE_DTRACE_DASH_G_FALSE@
-HAVE_DTRACE_DASH_G_TRUE = @HAVE_DTRACE_DASH_G_TRUE@
-HAVE_DTRACE_FALSE = @HAVE_DTRACE_FALSE@
-HAVE_DTRACE_TRUE = @HAVE_DTRACE_TRUE@
 HAVE_NETWARE_FALSE = @HAVE_NETWARE_FALSE@
 HAVE_NETWARE_TRUE = @HAVE_NETWARE_TRUE@
 HAVE_YASSL_FALSE = @HAVE_YASSL_FALSE@
@@ -257,7 +248,6 @@ PERL5 = @PERL5@
 PROTOCOL_VERSION = @PROTOCOL_VERSION@
 PS = @PS@
 RANLIB = @RANLIB@
-RDTSC_SPARC_ASSEMBLY = @RDTSC_SPARC_ASSEMBLY@
 RM = @RM@
 SAVE_ASFLAGS = @SAVE_ASFLAGS@
 SAVE_CC = @SAVE_CC@
@@ -287,9 +277,14 @@ YACC = @YACC@
 ZLIB_DEPS = @ZLIB_DEPS@
 ZLIB_INCLUDES = @ZLIB_INCLUDES@
 ZLIB_LIBS = @ZLIB_LIBS@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
+ac_ct_GETCONF = @ac_ct_GETCONF@
+ac_ct_NM = @ac_ct_NM@
+ac_ct_RANLIB = @ac_ct_RANLIB@
+ac_ct_STRIP = @ac_ct_STRIP@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
@@ -310,10 +305,7 @@ condition_dependent_plugin_links = @condition_dependent_plugin_links@
 condition_dependent_plugin_modules = @condition_dependent_plugin_modules@
 condition_dependent_plugin_objects = @condition_dependent_plugin_objects@
 datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
 docs_dirs = @docs_dirs@
-dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 extra_docs = @extra_docs@
 host = @host@
@@ -321,25 +313,23 @@ host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
-htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
+innodb_system_libs = @innodb_system_libs@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
 libmysqld_dirs = @libmysqld_dirs@
-localedir = @localedir@
 localstatedir = @localstatedir@
 man1_files = @man1_files@
 man8_files = @man8_files@
 man_dirs = @man_dirs@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
-mysql_mandatory_plugins = @mysql_mandatory_plugins@
-mysql_optional_plugins = @mysql_optional_plugins@
 mysql_pg_dirs = @mysql_pg_dirs@
 mysql_pg_distdirs = @mysql_pg_distdirs@
 mysql_pg_unittest_dirs = @mysql_pg_unittest_dirs@
+mysql_plugin_defs = @mysql_plugin_defs@
 mysql_plugin_dirs = @mysql_plugin_dirs@
 mysql_plugin_libs = @mysql_plugin_libs@
 mysql_se_dirs = @mysql_se_dirs@
@@ -358,11 +348,8 @@ netware_dir = @netware_dir@
 oldincludedir = @oldincludedir@
 openssl_includes = @openssl_includes@
 openssl_libs = @openssl_libs@
-pdfdir = @pdfdir@
 plugin_archive_shared_target = @plugin_archive_shared_target@
 plugin_archive_static_target = @plugin_archive_static_target@
-plugin_audit_null_shared_target = @plugin_audit_null_shared_target@
-plugin_audit_null_static_target = @plugin_audit_null_static_target@
 plugin_blackhole_shared_target = @plugin_blackhole_shared_target@
 plugin_blackhole_static_target = @plugin_blackhole_static_target@
 plugin_csv_shared_target = @plugin_csv_shared_target@
@@ -377,6 +364,8 @@ plugin_ibmdb2i_shared_target = @plugin_ibmdb2i_shared_target@
 plugin_ibmdb2i_static_target = @plugin_ibmdb2i_static_target@
 plugin_innobase_shared_target = @plugin_innobase_shared_target@
 plugin_innobase_static_target = @plugin_innobase_static_target@
+plugin_innodb_plugin_shared_target = @plugin_innodb_plugin_shared_target@
+plugin_innodb_plugin_static_target = @plugin_innodb_plugin_static_target@
 plugin_myisam_shared_target = @plugin_myisam_shared_target@
 plugin_myisam_static_target = @plugin_myisam_static_target@
 plugin_myisammrg_shared_target = @plugin_myisammrg_shared_target@
@@ -385,15 +374,10 @@ plugin_ndbcluster_shared_target = @plugin_ndbcluster_shared_target@
 plugin_ndbcluster_static_target = @plugin_ndbcluster_static_target@
 plugin_partition_shared_target = @plugin_partition_shared_target@
 plugin_partition_static_target = @plugin_partition_static_target@
-plugin_perfschema_shared_target = @plugin_perfschema_shared_target@
-plugin_perfschema_static_target = @plugin_perfschema_static_target@
-plugin_semisync_shared_target = @plugin_semisync_shared_target@
-plugin_semisync_static_target = @plugin_semisync_static_target@
 plugin_tokudb_shared_target = @plugin_tokudb_shared_target@
 plugin_tokudb_static_target = @plugin_tokudb_static_target@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
-psdir = @psdir@
 pstack_dir = @pstack_dir@
 pstack_libs = @pstack_libs@
 readline_basedir = @readline_basedir@
@@ -414,6 +398,7 @@ target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+tools_dirs = @tools_dirs@
 uname_prog = @uname_prog@
 yassl_dir = @yassl_dir@
 yassl_h_ln_cmd = @yassl_h_ln_cmd@