Commit ed297508 authored by monty@hundin.mysql.fi's avatar monty@hundin.mysql.fi
Browse files

Fixes for distributed build 

Changed --do-pstack to --enable-pstack
Removed pstack from default build
parent 52ad7578

client/Makefile.am

+2 −2
Original line number Diff line number Diff line
@@ -19,13 +19,13 @@ 
INCLUDES =			-I$(srcdir)/../include $(openssl_includes) \

				-I../include -I$(srcdir)/.. -I$(top_srcdir) \

				-I..

noinst_HEADERS =		client_priv.h

LIBS =				@CLIENT_LIBS@

LDADD =				@CLIENT_EXTRA_LDFLAGS@ ../libmysql/libmysqlclient.la

bin_PROGRAMS =			mysql mysqladmin mysqlcheck mysqlshow \

 mysqldump mysqlimport mysqltest mysqlbinlog

noinst_PROGRAMS =		insert_test select_test thread_test

noinst_HEADERS =		sql_string.h completion_hash.h my_readline.h

noinst_HEADERS =		sql_string.h completion_hash.h my_readline.h \

				client_priv.h

mysql_SOURCES =			mysql.cc readline.cc sql_string.cc completion_hash.cc

mysql_LDADD =			@readline_link@ @TERMCAP_LIB@ $(LDADD) $(CXXLDFLAGS)

mysql_DEPENDENCIES=		$(LIBRARIES) $(pkglib_LTLIBRARIES)

configure.in

+6 −4
Original line number Diff line number Diff line
@@ -699,9 +699,9 @@ int main() 
  AC_MSG_RESULT($atom_ops)



  AC_ARG_WITH(pstack,

    [  --without-pstack        Do not use the pstack backtrace library],

    [  --with-pstack         Use the pstack backtrace library],

    [ USE_PSTACK=$withval ],

    [USE_PSTACK=yes])

    [ USE_PSTACK=no ])

  pstack_libs=

  pstack_dirs=

  if test "$USE_PSTACK" = yes -a "$IS_LINUX" = "true" -a "$BASE_MACHINE_TYPE" = "i386" -a "$with_mit_threads" = "no"
@@ -717,7 +717,9 @@ dnl I have no idea if this is a good test - can not find docs for libiberty 
    if test x"$have_libiberty" = xyes -a x"$have_libbfd" = xyes

    then

      pstack_dirs='$(top_srcdir)'/pstack

      pstack_libs="$pstack_dirs/libpstack.a -lbfd -liberty"

      pstack_libs="../pstack/libpstack.a -lbfd -liberty"

      # We must link staticly when using pstack

      with_mysqld_ldflags="-all-static"

      AC_SUBST([pstack_dirs])

      AC_SUBST([pstack_libs])

      AC_DEFINE([USE_PSTACK])

sql/Makefile.am

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ INCLUDES = @MT_INCLUDES@ \ 
			@bdb_includes@ @innodb_includes@ @gemini_includes@ \

			-I$(srcdir)/../include \

			-I$(srcdir)/../regex \

			-I$(srcdir) -I../include $(openssl_includes)

			-I$(srcdir) -I../include -I. $(openssl_includes)

WRAPLIBS=		@WRAPLIBS@

SUBDIRS =		share

libexec_PROGRAMS =	mysqld

sql/mysqld.cc

+2 −2
Original line number Diff line number Diff line
@@ -2642,9 +2642,8 @@ static struct option long_options[] = { 
  {"default-table-type",    required_argument, 0, (int) OPT_TABLE_TYPE},

  {"delay-key-write-for-all-tables",

                            no_argument,       0, (int) OPT_DELAY_KEY_WRITE},

  {"do-pstack",

                            no_argument,       0, (int) OPT_DO_PSTACK},

  {"enable-locking",        no_argument,       0, (int) OPT_ENABLE_LOCK},

  {"enable-pstack",         no_argument,       0, (int) OPT_DO_PSTACK},

  {"exit-info",             optional_argument, 0, 'T'},

  {"flush",                 no_argument,       0, (int) OPT_FLUSH},

#ifdef HAVE_GEMINI_DB
@@ -3188,6 +3187,7 @@ static void usage(void) 
			Don't flush key buffers between writes for any MyISAM\n\

			table\n\

  --enable-locking	Enable system locking\n\

  --enable-pstack	Print a symbolic stack trace on failure\n\

  -T, --exit-info	Used for debugging;  Use at your own risk!\n\

  --flush		Flush tables to disk between SQL commands\n\

  -?, --help		Display this help and exit\n\