Various build fixes (bug 5997 part 14, r=ds).

extensions/curl/curl-src/lib/AMBuilder

@@ -58,6 +58,7 @@ binary.sources += [
   'llist.c',
   'md5.c',
   'memdebug.c',
+  'mprintf.c',
   'multi.c',
   'netrc.c',
   'nss.c',
@@ -87,7 +88,5 @@ binary.sources += [
   'url.c',
   'version.c'
 ]
-if builder.target_platform != 'windows':
-  builder.sources += ['mprintf.c']
 rvalue = builder.Add(binary)
 

extensions/mysql/AMBuilder

@@ -8,7 +8,7 @@ if SM.mysql_root:
     os.path.join(SM.mms_root, 'core', 'sourcehook')
   ]
 
-  if builder.target_platform is 'linux' or builder.target_platform is 'darwin':
+  if builder.target_platform is 'linux' or builder.target_platform is 'mac':
     binary.compiler.postlink += [
       os.path.join(SM.mysql_root, 'lib', 'libmysqlclient_r.a'),
       '-lz',