--- mysql-4.0.13/configure.old	Fri Jun 13 22:51:38 2003
+++ mysql-4.0.13/configure	Fri Jun 13 22:52:44 2003
@@ -6110,8 +6110,9 @@
     archive_cmds='$nonopt $(test "x$module" = xyes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linker_flags -install_name $rpath/$soname $verstring'
     # We need to add '_' to the symbols in $export_symbols first
     #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols'
-    hardcode_direct=yes
+    hardcode_direct=no
     hardcode_shlibpath_var=no
+    hardcode_libdir_flag_spec=' '
     whole_archive_flag_spec='-all_load $convenience'
     ;;
 
--- mysql-4.0.13/libmysqld/examples/Makefile.in.old	Sat Jun 14 21:13:23 2003
+++ mysql-4.0.13/libmysqld/examples/Makefile.in	Sat Jun 14 21:14:16 2003
@@ -274,7 +274,7 @@
 	$(CXXLINK) $(mysql_LDFLAGS) $(mysql_OBJECTS) $(mysql_LDADD) $(LIBS)
 mysqltest$(EXEEXT): $(mysqltest_OBJECTS) $(mysqltest_DEPENDENCIES) 
 	@rm -f mysqltest$(EXEEXT)
-	$(LINK) $(mysqltest_LDFLAGS) $(mysqltest_OBJECTS) $(mysqltest_LDADD) $(LIBS)
+	$(CXXLINK) $(mysqltest_LDFLAGS) $(mysqltest_OBJECTS) $(mysqltest_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT) core *.core
--- mysql-4.0.13/configure.orig	Tue Jun 24 08:49:46 2003
+++ mysql-4.0.13/configure	Tue Jun 24 08:51:39 2003
@@ -12755,12 +12755,21 @@
   *darwin6*)
     if test "$ac_cv_c_compiler_gnu" = "yes"
     then
-      FLAGS="-traditional-cpp -DHAVE_DARWIN_THREADS -D_P1003_1B_VISIBLE -DSIGNAL_WITH_VIO_CLOSE -DSIGNALS_DONT_BREAK_READ -DHAVE_BROKEN_REALPATH -DFN_NO_CASE_SENCE"
+      FLAGS="-DHAVE_DARWIN_THREADS -D_P1003_1B_VISIBLE -DSIGNAL_WITH_VIO_CLOSE -DSIGNALS_DONT_BREAK_READ -DHAVE_BROKEN_REALPATH -DFN_NO_CASE_SENCE"
       CFLAGS="$CFLAGS $FLAGS"
       CXXFLAGS="$CXXFLAGS $FLAGS"
       MAX_C_OPTIMIZE="-O"
     fi
     ;;
+  *darwin7*)
+    if test "$ac_cv_c_compiler_gnu" = "yes"
+    then
+      FLAGS="-DHAVE_DARWIN_THREADS -D_P1003_1B_VISIBLE -DSIGNAL_WITH_VIO_CLOSE -DSIGNALS_DONT_BREAK_READ -DHAVE_BROKEN_REALPATH -DFN_NO_CASE_SENCE"
+      CFLAGS="$CFLAGS $FLAGS"
+      CXXFLAGS="$CXXFLAGS $FLAGS"
+      MAX_C_OPTIMIZE="-O"
+    fi
+    ;;    
   *freebsd*)
     echo "Adding fix for interrupted reads"
     CFLAGS="$CFLAGS -DHAVE_BROKEN_REALPATH"