Commit 3edbb869 authored by monty@tik.mysql.fi's avatar monty@tik.mysql.fi
Browse files

Fix to be able to configure without --with-tools

parent 6680695f

Makefile.am

+1 −7
Original line number Diff line number Diff line
@@ -29,8 +29,7 @@ SUBDIRS = include @docs_dirs@ @readline_dir@ \ 
# Relink after clean

linked_sources = linked_client_sources linked_server_sources \

		 linked_libmysql_sources linked_libmysql_r_sources \

		 linked_libmysqld_sources linked_include_sources \

                 linked_tools_sources

		 linked_libmysqld_sources linked_include_sources



CLEANFILES = $(linked_sources)
@@ -45,11 +44,6 @@ linked_client_sources: @linked_client_targets@ 
	cd client; $(MAKE) link_sources

	echo timestamp > linked_client_sources



linked_tools_sources: 

	cd tools; $(MAKE) link_sources

	echo timestamp > linked_tools_sources





linked_libmysql_sources:

	cd libmysql; $(MAKE) link_sources

	echo timestamp > linked_libmysql_sources

configure.in

+1 −1
Original line number Diff line number Diff line
@@ -1694,7 +1694,7 @@ then 
else

  tools_dirs=""

fi

AC_SUBST([tools_dirs])

AC_SUBST(tools_dirs)



MYSQL_CHECK_CPU

MYSQL_CHECK_MYSQLFS

libmysql/Makefile.shared

+8 −1
Original line number Diff line number Diff line
@@ -56,7 +56,14 @@ mysysobjects1 = my_init.lo my_static.lo my_malloc.lo my_realloc.lo \ 
			thr_mutex.lo mulalloc.lo string.lo default.lo \

			my_compress.lo array.lo my_once.lo list.lo my_net.lo \

                        charset.lo hash.lo mf_iocache.lo my_seek.lo \

			my_pread.lo mf_cache.lo

			my_pread.lo mf_cache.lo my_vsnprintf.lo



link_sources:

	for f in $(mysys_src); do \

	rm -f $$f; \

	@LN_CP_F@ ../mysys/$$f $$f; \

	done;



# Not needed in the minimum library

mysysobjects2 =		getopt.lo getopt1.lo getvar.lo my_lib.lo

mysysobjects =		$(mysysobjects1) $(mysysobjects2)

tools/Makefile.am

+0 −8
Original line number Diff line number Diff line
@@ -8,14 +8,6 @@ mysqlmngd_SOURCES = mysqlmngd.c my_vsnprintf.c 
mysqltest_DEPENDENCIES=   	$(LIBRARIES) $(pkglib_LTLIBRARIES)

DEFS =			-DUNDEF_THREADS_HACK



mysys_src=my_vsnprintf.c mysys_priv.h



link_sources:

	for f in $(mysys_src); do \

	rm -f $$f; \

	@LN_CP_F@ ../mysys/$$f $$f; \

	done;



# Don't update the files from bitkeeper

%::SCCS/s.%