diff options
| -rw-r--r-- | BitKeeper/etc/logging_ok | 2 | ||||
| -rw-r--r-- | Docs/Makefile.am | 4 | ||||
| -rw-r--r-- | configure.in | 27 | ||||
| -rw-r--r-- | libmysql/Makefile.am | 4 | ||||
| -rwxr-xr-x | ltconfig | 4 | ||||
| -rw-r--r-- | ltmain.sh | 1 | ||||
| -rw-r--r-- | mysql-test/Makefile.am | 8 | ||||
| -rw-r--r-- | sql-bench/Makefile.am | 14 | ||||
| -rw-r--r-- | support-files/Makefile.am | 3 |
9 files changed, 37 insertions, 30 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index 1931ac4e5ec..f1aadc110a1 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -8,5 +8,5 @@ sasha@work.mysql.com serg@donna.mysql.com serg@serg.mysql.com tim@cane.mysql.fi -tim@work.mysql.com tim@threads.polyesthetic.msg +tim@work.mysql.com diff --git a/Docs/Makefile.am b/Docs/Makefile.am index 3d8c3e39905..c4da4e9d0d3 100644 --- a/Docs/Makefile.am +++ b/Docs/Makefile.am @@ -115,8 +115,8 @@ manual_letter.ps: manual.texi include.texi dist-hook: BD=`cd $(top_srcdir); pwd`; \ if test ! -d $(distdir)/Flags; then mkdir -p $(distdir)/Flags; fi; \ - cp -p $(srcdir)/Flags/*.gif $(srcdir)/Flags/*.eps $(srcdir)/Flags/*.txt \ - $(distdir)/Flags; + $(INSTALL_DATA) $(srcdir)/Flags/*.gif $(srcdir)/Flags/*.eps \ + $(srcdir)/Flags/*.txt $(distdir)/Flags; echo "PostScript and PDF versions suitable for printing" \ > $(distdir)/manual.ps echo "are available from http://www.mysql.com/Manual/" \ diff --git a/configure.in b/configure.in index a55a1e95188..61a19b67067 100644 --- a/configure.in +++ b/configure.in @@ -253,7 +253,7 @@ case "$target_os" in ;; esac ;; - sysv5uw7*) LIBS="-lsocket -lnsl $LIBS" + sysv5uw7*) if test "$GCC" != "yes"; then # We are using built-in inline function CFLAGS="$CFLAGS -Kalloca" @@ -631,8 +631,6 @@ then fi # We make a special variable for client library's to avoid including # thread libs in the client. -LIBS_AFTER_SOCKET=$LIBS -LIBS="$LIBS_BEFORE_SOCKET $LIBS_SOCKET $LIBS_AFTER_SOCKET" NON_THREADED_CLIENT_LIBS="$LIBS" AC_MSG_CHECKING([for int8]) @@ -824,6 +822,13 @@ Reference Manual.]) fi fi fi + + +dnl This is needed because -lsocket has to come after the thread +dnl library on SCO. +AC_DEFUN([MYSQL_REMOVE_SOCKET_FROM_LIBS_HACK], [ + LIBS=`echo " $LIBS " | sed -e 's/ -lsocket / /g'` +]) # Hack for SCO UNIX if test "$with_named_thread" = "no" then @@ -832,7 +837,7 @@ then then if test -f /usr/lib/libgthreads.a -o -f /usr/lib/libgthreads.so then - LIBS="$LIBS_BEFORE_SOCKET $LIBS_AFTER_SOCKET" + MYSQL_REMOVE_SOCKET_FROM_LIBS_HACK with_named_thread="-lgthreads -lsocket -lgthreads" # sched.h conflicts with fsu-threads touch ./include/sched.h @@ -847,7 +852,7 @@ then AC_MSG_RESULT("yes") elif test -f /usr/local/lib/libpthread.a -o -f /usr/local/lib/libpthread.so then - LIBS="$LIBS_BEFORE_SOCKET $LIBS_AFTER_SOCKET" + MYSQL_REMOVE_SOCKET_FROM_LIBS_HACK with_named_thread="-lpthread -lsocket" # sched.h conflicts with fsu-threads # touch ./include/sched.h @@ -871,12 +876,12 @@ then then if test -f /usr/lib/libthread.so -o -f /usr/lib/libthreadT.so then - LIBS="$LIBS_BEFORE_SOCKET $LIBS_AFTER_SOCKET" + MYSQL_REMOVE_SOCKET_FROM_LIBS_HACK if expr "$CC" : ".*gcc.*" then - with_named_thread="-pthread -lsocket -lnsl" + with_named_thread="-pthread -lnsl" else - with_named_thread="-Kthread -lsocket -lnsl" + with_named_thread="-Kthread -lnsl" fi if expr "$SYSTEM_TYPE" : ".*unixware7.0.0" > /dev/null then @@ -917,8 +922,8 @@ then then if test -f /usr/lib/libthread.so -o -f /usr/lib/libthreadT.so then - LIBS="$LIBS_BEFORE_SOCKET $LIBS_AFTER_SOCKET" - with_named_thread="-Kthread -lsocket -lnsl" + MYSQL_REMOVE_SOCKET_FROM_LIBS_HACK + with_named_thread="-Kthread -lnsl" if expr "$SYSTEM_TYPE" : ".*unixware7.0.0" > /dev/null then AC_DEFINE(HAVE_UNIXWARE7_THREADS) @@ -949,7 +954,7 @@ then AC_MSG_CHECKING("Siemens threads") if test -f /usr/lib/libxnet.so -a "$SYSTEM_TYPE" = "sni-sysv4" then - LIBS="$LIBS_BEFORE_SOCKET -lxnet $LIBS_AFTER_SOCKET" + LIBS="-lxnet $LIBS" NON_THREADED_CLIENT_LIBS="$NON_THREADED_CLIENT_LIBS -lxnet" with_named_thread="-Kthread $LDFLAGS -lxnet" LD_FLAGS="" diff --git a/libmysql/Makefile.am b/libmysql/Makefile.am index 7b6472ecaba..baf40a389a3 100644 --- a/libmysql/Makefile.am +++ b/libmysql/Makefile.am @@ -80,8 +80,8 @@ do-lib-dist: objs="$$objs1 $$objs2"; \ rm -rf $$dir; \ mkdir $$dir; \ - cp $$srcs $(mysysheaders) $$dir; \ - for i in $(nh); do cp ../include/$$i $$dir; done; \ + $(INSTALL_DATA) $$srcs $(mysysheaders) $$dir; \ + for i in $(nh); do $(INSTALL_DATA) ../include/$$i $$dir; done; \ echo "# A very minimal Makefile to compile" > $$dir/Makefile; \ echo "# the minimized libmysql library" >> $$dir/Makefile; \ echo "# This file is autogenerated from Makefile.am" >> $$dir/Makefile; \ @@ -1500,7 +1500,7 @@ else no_undefined_flag=' -z text' # $CC -shared without GNU ld will not create a library from C++ # object files and a static libstdc++, better avoid it by now - archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linkopts' + archive_cmds='$UW7_compile_command -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linkopts' archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linkopts~$rm $lib.exp' hardcode_libdir_flag_spec= @@ -1540,7 +1540,7 @@ else ;; unixware7*) - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts' + archive_cmds='$UW7_compile_command -G -h $soname -o $lib $libobjs $deplibs $linkopts' runpath_var='LD_RUN_PATH' hardcode_shlibpath_var=no ;; diff --git a/ltmain.sh b/ltmain.sh index a1c36109556..eba25223e45 100644 --- a/ltmain.sh +++ b/ltmain.sh @@ -809,6 +809,7 @@ compiler." ;; esac compile_command="$nonopt" + UW7_compile_command="$nonopt" finalize_command="$nonopt" compile_rpath= diff --git a/mysql-test/Makefile.am b/mysql-test/Makefile.am index d7fab3940f2..6deb69b49df 100644 --- a/mysql-test/Makefile.am +++ b/mysql-test/Makefile.am @@ -27,10 +27,10 @@ CLEANFILES = $(test_SCRIPTS) dist-hook: mkdir -p $(distdir)/t $(distdir)/r $(distdir)/include \ $(distdir)/std_data - cp -p $(srcdir)/t/*.test $(srcdir)/t/*.opt $(distdir)/t - cp -p $(srcdir)/include/*.inc $(distdir)/include - cp -p $(srcdir)/r/*.result $(srcdir)/r/*.require $(distdir)/r - cp -p $(srcdir)/std_data/*.dat $(distdir)/std_data + $(INSTALL_DATA) $(srcdir)/t/*.test $(srcdir)/t/*.opt $(distdir)/t + $(INSTALL_DATA) $(srcdir)/include/*.inc $(distdir)/include + $(INSTALL_DATA) $(srcdir)/r/*.result $(srcdir)/r/*.require $(distdir)/r + $(INSTALL_DATA) $(srcdir)/std_data/*.dat $(distdir)/std_data install-data-local: $(mkinstalldirs) \ diff --git a/sql-bench/Makefile.am b/sql-bench/Makefile.am index 27d7c7be0d4..58369313054 100644 --- a/sql-bench/Makefile.am +++ b/sql-bench/Makefile.am @@ -37,13 +37,13 @@ dist-hook: $(distdir)/Results $(distdir)/Results-linux \ $(distdir)/Results-win32 \ $(distdir)/limits $(distdir)/Comments - cp -pr $(srcdir)/Data/ATIS $(distdir)/Data - cp -pr $(srcdir)/Data/Wisconsin $(distdir)/Data - cp -pr $(srcdir)/Results $(distdir)/ - cp -pr $(srcdir)/Results-linux $(distdir)/ - cp -pr $(srcdir)/Results-win32 $(distdir)/ - cp -pr $(srcdir)/limits $(distdir)/ - cp -pr $(srcdir)/Comments $(distdir)/ + $(INSTALL_DATA) $(srcdir)/Data/ATIS/*.* $(distdir)/Data + $(INSTALL_DATA) $(srcdir)/Data/Wisconsin/*.* $(distdir)/Data + $(INSTALL_DATA) $(srcdir)/Results/*-* $(distdir)/ + $(INSTALL_DATA) $(srcdir)/Results-linux/*-* $(distdir)/ + $(INSTALL_DATA) $(srcdir)/Results-win32/*-* $(distdir)/ + $(INSTALL_DATA) $(srcdir)/limits/*.* $(distdir)/ + $(INSTALL_DATA) $(srcdir)/Comments/*.* $(distdir)/ install-data-local: $(mkinstalldirs) \ diff --git a/support-files/Makefile.am b/support-files/Makefile.am index 94f47e37092..00e8b13b12c 100644 --- a/support-files/Makefile.am +++ b/support-files/Makefile.am @@ -33,9 +33,10 @@ pkgdata_DATA = my-small.cnf \ my-huge.cnf \ mysql-log-rotate \ mysql-@VERSION@.spec \ - mysql.server \ binary-configure +pkgdata_SCRIPTS = mysql.server + CLEANFILES = my-small.cnf \ my-medium.cnf \ my-large.cnf \ |