From 25106ec7551d143d4a8b53b78b04da23876497b6 Mon Sep 17 00:00:00 2001 From: "monty@donna.mysql.com" <> Date: Thu, 14 Sep 2000 15:10:06 +0300 Subject: [PATCH 1/2] configure fixes --- Docs/Makefile.am | 2 ++ Docs/manual.texi | 2 -- Makefile.am | 6 +++++- include/Makefile.am | 11 ++++++----- libmysql/Makefile.shared | 2 +- scripts/Makefile.am | 4 +++- scripts/make_binary_distribution.sh | 0 scripts/mysql_convert_table_format.sh | 0 scripts/mysql_find_rows.sh | 0 scripts/mysql_setpermission.sh | 0 scripts/mysql_zap.sh | 0 scripts/mysqlaccess.conf | 0 scripts/mysqlaccess.sh | 0 scripts/mysqlbug.sh | 0 scripts/mysqlhotcopy.sh | 0 scripts/safe_mysqld-watch.sh | 0 scripts/safe_mysqld.sh | 0 support-files/Makefile.am | 5 ++++- support-files/binary-configure.sh | 0 19 files changed, 21 insertions(+), 11 deletions(-) mode change 100755 => 100644 scripts/make_binary_distribution.sh mode change 100755 => 100644 scripts/mysql_convert_table_format.sh mode change 100755 => 100644 scripts/mysql_find_rows.sh mode change 100755 => 100644 scripts/mysql_setpermission.sh mode change 100755 => 100644 scripts/mysql_zap.sh mode change 100755 => 100644 scripts/mysqlaccess.conf mode change 100755 => 100644 scripts/mysqlaccess.sh mode change 100755 => 100644 scripts/mysqlbug.sh mode change 100755 => 100644 scripts/mysqlhotcopy.sh mode change 100755 => 100644 scripts/safe_mysqld-watch.sh mode change 100755 => 100644 scripts/safe_mysqld.sh mode change 100755 => 100644 support-files/binary-configure.sh diff --git a/Docs/Makefile.am b/Docs/Makefile.am index 8f5276b1b22..b9fa5401a37 100644 --- a/Docs/Makefile.am +++ b/Docs/Makefile.am @@ -28,6 +28,8 @@ all: $(targets) txt_files txt_files: ../INSTALL-SOURCE ../COPYING ../COPYING.LIB \ ../MIRRORS INSTALL-BINARY +CLEAN_FILES: manual.ps + # The PostScript version is so big that is not included in the # standard distribution. It is available for download from the home page. paper: manual_a4.ps manual_letter.ps diff --git a/Docs/manual.texi b/Docs/manual.texi index 183c58f23c2..a730f7d15cf 100644 --- a/Docs/manual.texi +++ b/Docs/manual.texi @@ -5754,8 +5754,6 @@ shell> CC=gcc CFLAGS="-O6" \ If you have the Sun Workshop 4.2 compiler, you can run @code{configure} like this: -CC=cc CFLAGS="-xstrconst -Xa -xO4 -native -mt" CXX=CC CXXFLAGS="-xO4 -native -noex -mt" ./configure --prefix=/usr/local/mysql - @example shell> CC=cc CFLAGS="-Xa -fast -xO4 -native -xstrconst -mt" \ CXX=CC CXXFLAGS="-noex -XO4 -mt" \ diff --git a/Makefile.am b/Makefile.am index a24164f0bca..bdb3502aa3d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -30,7 +30,11 @@ SUBDIRS = include @docs_dirs@ @readline_dir@ \ CLEANFILES = linked_client_sources linked_server_sources linked_libmysql_sources linked_libmysql_r_sources # 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@ echo timestamp > linked_client_sources diff --git a/include/Makefile.am b/include/Makefile.am index 3f6ed988fbb..4e2fdb22574 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -15,13 +15,13 @@ # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, # 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 \ mysqld_error.h my_list.h \ my_pthread.h my_no_pthread.h raid.h errmsg.h \ my_config.h my_global.h my_net.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 \ nisam.h heap.h merge.h \ myisam.h myisampack.h myisammrg.h ft_global.h\ @@ -32,15 +32,16 @@ noinst_HEADERS = global.h config-win.h \ mysql_version.h.in # 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 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 -my_config.h: ../config.h +link_sources: $(CP) ../config.h my_config.h # This should be changed in the source and removed. diff --git a/libmysql/Makefile.shared b/libmysql/Makefile.shared index b6d0f93cbba..50e7cd95dc3 100644 --- a/libmysql/Makefile.shared +++ b/libmysql/Makefile.shared @@ -75,7 +75,7 @@ clean-local: rm -f `echo $(mystringsobjects) | sed "s;\.lo;.c;g"` \ `echo $(dbugobjects) | 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 ctype_extra_sources.c: conf_to_src diff --git a/scripts/Makefile.am b/scripts/Makefile.am index d4e62172a08..b3ac40d9959 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -53,12 +53,14 @@ pkgdata_DATA = make_binary_distribution CLEANFILES = @server_scripts@ \ make_binary_distribution \ msql2mysql \ + mysql_config \ mysql_fix_privilege_tables \ mysql_setpermission \ mysql_zap \ mysqlaccess \ mysql_convert_table_format \ - mysql_find_rows + mysql_find_rows \ + mysqlhotcopy SUPERCLEANFILES = mysqlbug diff --git a/scripts/make_binary_distribution.sh b/scripts/make_binary_distribution.sh old mode 100755 new mode 100644 diff --git a/scripts/mysql_convert_table_format.sh b/scripts/mysql_convert_table_format.sh old mode 100755 new mode 100644 diff --git a/scripts/mysql_find_rows.sh b/scripts/mysql_find_rows.sh old mode 100755 new mode 100644 diff --git a/scripts/mysql_setpermission.sh b/scripts/mysql_setpermission.sh old mode 100755 new mode 100644 diff --git a/scripts/mysql_zap.sh b/scripts/mysql_zap.sh old mode 100755 new mode 100644 diff --git a/scripts/mysqlaccess.conf b/scripts/mysqlaccess.conf old mode 100755 new mode 100644 diff --git a/scripts/mysqlaccess.sh b/scripts/mysqlaccess.sh old mode 100755 new mode 100644 diff --git a/scripts/mysqlbug.sh b/scripts/mysqlbug.sh old mode 100755 new mode 100644 diff --git a/scripts/mysqlhotcopy.sh b/scripts/mysqlhotcopy.sh old mode 100755 new mode 100644 diff --git a/scripts/safe_mysqld-watch.sh b/scripts/safe_mysqld-watch.sh old mode 100755 new mode 100644 diff --git a/scripts/safe_mysqld.sh b/scripts/safe_mysqld.sh old mode 100755 new mode 100644 diff --git a/support-files/Makefile.am b/support-files/Makefile.am index ef37784c985..923bd7f2f20 100644 --- a/support-files/Makefile.am +++ b/support-files/Makefile.am @@ -41,7 +41,10 @@ CLEANFILES = my-small.cnf \ my-huge.cnf \ mysql.spec \ mysql-@VERSION@.spec \ - mysql.server + mysql-log-rotate \ + mysql.server \ + binary-configure + mysql-@VERSION@.spec: mysql.spec rm -f $@ diff --git a/support-files/binary-configure.sh b/support-files/binary-configure.sh old mode 100755 new mode 100644 From ac93ec4ae11d59c71547c90a90e85136d03536e8 Mon Sep 17 00:00:00 2001 From: "monty@donna.mysql.com" <> Date: Thu, 14 Sep 2000 15:40:55 +0300 Subject: [PATCH 2/2] configure fix to handle my_config.h --- Makefile.am | 4 ++-- include/Makefile.am | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Makefile.am b/Makefile.am index bdb3502aa3d..bedcdbf7386 100644 --- a/Makefile.am +++ b/Makefile.am @@ -27,10 +27,10 @@ SUBDIRS = include @docs_dirs@ @readline_dir@ \ @bench_dirs@ support-files # Relink after clean -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 linked_include_sources # This is just so that the linking is done early. -config.h: linked_client_sources linked_server_sources linked_include_sources +config.h: linked_include_sources linked_client_sources linked_server_sources linked_include_sources: cd include; $(MAKE) link_sources diff --git a/include/Makefile.am b/include/Makefile.am index 4e2fdb22574..1833ea8096b 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -19,9 +19,9 @@ BUILT_SOURCES = mysql_version.h m_ctype.h pkginclude_HEADERS = dbug.h m_string.h my_sys.h mysql.h mysql_com.h \ mysqld_error.h my_list.h \ my_pthread.h my_no_pthread.h raid.h errmsg.h \ - my_config.h my_global.h my_net.h \ + my_global.h my_net.h \ sslopt-case.h sslopt-longopts.h sslopt-usage.h \ - sslopt-vars.h my_config.h $(BUILT_SOURCES) + sslopt-vars.h $(BUILT_SOURCES) noinst_HEADERS = global.h config-win.h \ nisam.h heap.h merge.h \ myisam.h myisampack.h myisammrg.h ft_global.h\ @@ -30,6 +30,7 @@ noinst_HEADERS = global.h config-win.h \ my_tree.h hash.h thr_alarm.h thr_lock.h \ getopt.h t_ctype.h violite.h \ mysql_version.h.in +EXTRA_DIST= my_config.h # mysql_version.h are generated SUPERCLEANFILES = mysql_version.h my_global.h