File mysql-build-only-server.patch of Package mysql

Overview Repositories Revisions Requests Users Attributes Meta

File mysql-build-only-server.patch of Package mysql (Revision 404546d3975f6ab1007a240791d4e9ff)

Currently displaying revision 404546d3975f6ab1007a240791d4e9ff , Show latest

# we build multiple versions of the server, but only one version of the client
# and libraries, so this speeds up the build a bit
# --without-client needs --without-mysqlmanager, too (the logic could be
# smarter...)
--- configure.in
+++ configure.in
@@ -2505,6 +2505,14 @@ sql_server_dirs=
 server_scripts=
 thread_dirs=
 
+AC_ARG_WITH(client,
+    [  --without-client        Skip building the client and libraries],
+    [with_client=$withval],
+    [with_client=yes]
+)
+
+if test "$with_client" = "yes"
+then
 dnl This probably should be cleaned up more - for now the threaded
 dnl client is just using plain-old libs.
 sql_client_dirs="strings regex mysys libmysql client"
@@ -2519,6 +2527,7 @@ then
 fi
 
 CLIENT_LIBS="$NON_THREADED_LIBS $openssl_libs $ZLIB_LIBS $STATIC_NSS_FLAGS"
+fi
 
 AC_SUBST(CLIENT_LIBS)
 AC_SUBST(NON_THREADED_LIBS)
@@ -2526,6 +2535,19 @@ AC_SUBST(STATIC_NSS_FLAGS)
 AC_SUBST(sql_client_dirs)
 AC_SUBST(linked_client_targets)
 
+AC_ARG_WITH(tests,
+    [  --without-tests         Skip building the tests subdirectory],
+    [with_tests=$withval],
+    [with_tests=yes]
+)
+tests_dirs=
+dnl the binaries in tests require the client library
+if test "$with_tests" = "yes" -a "$with_client" = "yes"
+then
+  tests_dirs="tests"
+fi
+AC_SUBST(tests_dirs)
+
 # If configuring for NetWare, set up to link sources from and build the netware directory
 netware_dir=
 linked_netware_sources=
--- Makefile.am
+++ Makefile.am
@@ -24,14 +24,14 @@ EXTRA_DIST =		INSTALL-SOURCE INSTALL-WIN
 SUBDIRS =		. include @docs_dirs@ @zlib_dir@ @yassl_dir@ \
 			@readline_topdir@ sql-common \
 			@thread_dirs@ pstack \
-			@sql_union_dirs@ scripts @man_dirs@ tests \
+			@sql_union_dirs@ scripts @man_dirs@ @tests_dirs@ \
 			netware @libmysqld_dirs@ \
 			@bench_dirs@ support-files @tools_dirs@
 
 DIST_SUBDIRS =		. include @docs_dirs@ zlib \
 			@readline_topdir@ sql-common \
 			@thread_dirs@ pstack \
-			@sql_union_dirs@ scripts @man_dirs@ tests SSL\
+			@sql_union_dirs@ scripts @man_dirs@ @tests_dirs@ SSL\
 			BUILD netware os2 @libmysqld_dirs@ \
 			@bench_dirs@ support-files @tools_dirs@ win

Places

File mysql-build-only-server.patch of Package mysql (Revision 404546d3975f6ab1007a240791d4e9ff)

Places