Commit 25106ec7 authored by monty@donna.mysql.com's avatar monty@donna.mysql.com

configure fixes

parent b581f17b
...@@ -28,6 +28,8 @@ all: $(targets) txt_files ...@@ -28,6 +28,8 @@ all: $(targets) txt_files
txt_files: ../INSTALL-SOURCE ../COPYING ../COPYING.LIB \ txt_files: ../INSTALL-SOURCE ../COPYING ../COPYING.LIB \
../MIRRORS INSTALL-BINARY ../MIRRORS INSTALL-BINARY
CLEAN_FILES: manual.ps
# The PostScript version is so big that is not included in the # The PostScript version is so big that is not included in the
# standard distribution. It is available for download from the home page. # standard distribution. It is available for download from the home page.
paper: manual_a4.ps manual_letter.ps paper: manual_a4.ps manual_letter.ps
......
...@@ -5754,8 +5754,6 @@ shell> CC=gcc CFLAGS="-O6" \ ...@@ -5754,8 +5754,6 @@ shell> CC=gcc CFLAGS="-O6" \
If you have the Sun Workshop 4.2 compiler, you can run @code{configure} like If you have the Sun Workshop 4.2 compiler, you can run @code{configure} like
this: this:
CC=cc CFLAGS="-xstrconst -Xa -xO4 -native -mt" CXX=CC CXXFLAGS="-xO4 -native -noex -mt" ./configure --prefix=/usr/local/mysql
@example @example
shell> CC=cc CFLAGS="-Xa -fast -xO4 -native -xstrconst -mt" \ shell> CC=cc CFLAGS="-Xa -fast -xO4 -native -xstrconst -mt" \
CXX=CC CXXFLAGS="-noex -XO4 -mt" \ CXX=CC CXXFLAGS="-noex -XO4 -mt" \
...@@ -30,7 +30,11 @@ SUBDIRS = include @docs_dirs@ @readline_dir@ \ ...@@ -30,7 +30,11 @@ SUBDIRS = include @docs_dirs@ @readline_dir@ \
CLEANFILES = linked_client_sources linked_server_sources linked_libmysql_sources linked_libmysql_r_sources CLEANFILES = linked_client_sources linked_server_sources linked_libmysql_sources linked_libmysql_r_sources
# This is just so that the linking is done early. # This is just so that the linking is done early.
config.h: linked_client_sources linked_server_sources config.h: linked_client_sources linked_server_sources linked_include_sources
linked_include_sources:
cd include; $(MAKE) link_sources
echo timestamp > linked_include_sources
linked_client_sources: @linked_client_targets@ linked_client_sources: @linked_client_targets@
echo timestamp > linked_client_sources echo timestamp > linked_client_sources
......
...@@ -15,13 +15,13 @@ ...@@ -15,13 +15,13 @@
# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
# MA 02111-1307, USA # MA 02111-1307, USA
BUILT_SOURCES = my_config.h mysql_version.h m_ctype.h BUILT_SOURCES = mysql_version.h m_ctype.h
pkginclude_HEADERS = dbug.h m_string.h my_sys.h mysql.h mysql_com.h \ pkginclude_HEADERS = dbug.h m_string.h my_sys.h mysql.h mysql_com.h \
mysqld_error.h my_list.h \ mysqld_error.h my_list.h \
my_pthread.h my_no_pthread.h raid.h errmsg.h \ my_pthread.h my_no_pthread.h raid.h errmsg.h \
my_config.h my_global.h my_net.h \ my_config.h my_global.h my_net.h \
sslopt-case.h sslopt-longopts.h sslopt-usage.h \ sslopt-case.h sslopt-longopts.h sslopt-usage.h \
sslopt-vars.h $(BUILT_SOURCES) sslopt-vars.h my_config.h $(BUILT_SOURCES)
noinst_HEADERS = global.h config-win.h \ noinst_HEADERS = global.h config-win.h \
nisam.h heap.h merge.h \ nisam.h heap.h merge.h \
myisam.h myisampack.h myisammrg.h ft_global.h\ myisam.h myisampack.h myisammrg.h ft_global.h\
...@@ -32,15 +32,16 @@ noinst_HEADERS = global.h config-win.h \ ...@@ -32,15 +32,16 @@ noinst_HEADERS = global.h config-win.h \
mysql_version.h.in mysql_version.h.in
# mysql_version.h are generated # mysql_version.h are generated
SUPERCLEANFILES = mysql_version.h SUPERCLEANFILES = mysql_version.h my_global.h
# Some include files that may be moved and patched by configure # Some include files that may be moved and patched by configure
DISTCLEANFILES = sched.h DISTCLEANFILES = sched.h
CLEANFILES = my_config.h
all-local: my_config.h my_global.h all-local: my_global.h
# Since we include my_config.h it better exist from the beginning # Since we include my_config.h it better exist from the beginning
my_config.h: ../config.h link_sources:
$(CP) ../config.h my_config.h $(CP) ../config.h my_config.h
# This should be changed in the source and removed. # This should be changed in the source and removed.
......
...@@ -75,7 +75,7 @@ clean-local: ...@@ -75,7 +75,7 @@ clean-local:
rm -f `echo $(mystringsobjects) | sed "s;\.lo;.c;g"` \ rm -f `echo $(mystringsobjects) | sed "s;\.lo;.c;g"` \
`echo $(dbugobjects) | sed "s;\.lo;.c;g"` \ `echo $(dbugobjects) | sed "s;\.lo;.c;g"` \
`echo $(mysysobjects) | sed "s;\.lo;.c;g"` \ `echo $(mysysobjects) | sed "s;\.lo;.c;g"` \
$(mystringsextra) ctype_extra_sources.c \ $(mystringsextra) $(mysysheaders) ctype_extra_sources.c \
../linked_client_sources ../linked_client_sources
ctype_extra_sources.c: conf_to_src ctype_extra_sources.c: conf_to_src
......
...@@ -53,12 +53,14 @@ pkgdata_DATA = make_binary_distribution ...@@ -53,12 +53,14 @@ pkgdata_DATA = make_binary_distribution
CLEANFILES = @server_scripts@ \ CLEANFILES = @server_scripts@ \
make_binary_distribution \ make_binary_distribution \
msql2mysql \ msql2mysql \
mysql_config \
mysql_fix_privilege_tables \ mysql_fix_privilege_tables \
mysql_setpermission \ mysql_setpermission \
mysql_zap \ mysql_zap \
mysqlaccess \ mysqlaccess \
mysql_convert_table_format \ mysql_convert_table_format \
mysql_find_rows mysql_find_rows \
mysqlhotcopy
SUPERCLEANFILES = mysqlbug SUPERCLEANFILES = mysqlbug
......
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
...@@ -41,7 +41,10 @@ CLEANFILES = my-small.cnf \ ...@@ -41,7 +41,10 @@ CLEANFILES = my-small.cnf \
my-huge.cnf \ my-huge.cnf \
mysql.spec \ mysql.spec \
mysql-@VERSION@.spec \ mysql-@VERSION@.spec \
mysql.server mysql-log-rotate \
mysql.server \
binary-configure
mysql-@VERSION@.spec: mysql.spec mysql-@VERSION@.spec: mysql.spec
rm -f $@ rm -f $@
......
File mode changed from 100755 to 100644
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment