<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[Freeswitch-trunk][15650] </title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<div id="header">FreeSWITCH Subversion</div>
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://fisheye.freeswitch.org/changelog/FreeSWITCH?cs=15650">15650</a></dd>
<dt>Author</dt> <dd>mikej</dd>
<dt>Date</dt> <dd>2009-11-23 23:25:16 -0600 (Mon, 23 Nov 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>fix mod_spidermonkey on osX 10.6 (lets see if this breaks any other platforms)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunklibslibsndfileM4ltoptionsm4">freeswitch/trunk/libs/libsndfile/M4/ltoptions.m4</a></li>
<li><a href="#freeswitchtrunklibslibsndfileM4ltsugarm4">freeswitch/trunk/libs/libsndfile/M4/ltsugar.m4</a></li>
<li><a href="#freeswitchtrunklibslibsndfileM4ltversionm4">freeswitch/trunk/libs/libsndfile/M4/ltversion.m4</a></li>
<li><a href="#freeswitchtrunklibstiff382configinstallsh">freeswitch/trunk/libs/tiff-3.8.2/config/install-sh</a></li>
<li><a href="#freeswitchtrunksrcmodlanguagesmod_spidermonkeysmmak">freeswitch/trunk/src/mod/languages/mod_spidermonkey/sm.mak</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunklibslibsndfileM4ltoptionsm4"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/libsndfile/M4/ltoptions.m4 (15649 => 15650)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/libsndfile/M4/ltoptions.m4 2009-11-24 02:55:34 UTC (rev 15649)
+++ freeswitch/trunk/libs/libsndfile/M4/ltoptions.m4 2009-11-24 05:25:16 UTC (rev 15650)
</span><span class="lines">@@ -125,7 +125,7 @@
</span><span class="cx"> [enable_win32_dll=yes
</span><span class="cx">
</span><span class="cx"> case $host in
</span><del>-*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*)
</del><ins>+*-*-cygwin* | *-*-mingw* | *-*-pw32*)
</ins><span class="cx"> AC_CHECK_TOOL(AS, as, false)
</span><span class="cx"> AC_CHECK_TOOL(DLLTOOL, dlltool, false)
</span><span class="cx"> AC_CHECK_TOOL(OBJDUMP, objdump, false)
</span></span></pre></div>
<a id="freeswitchtrunklibslibsndfileM4ltsugarm4"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/libsndfile/M4/ltsugar.m4 (15649 => 15650)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/libsndfile/M4/ltsugar.m4 2009-11-24 02:55:34 UTC (rev 15649)
+++ freeswitch/trunk/libs/libsndfile/M4/ltsugar.m4 2009-11-24 05:25:16 UTC (rev 15650)
</span><span class="lines">@@ -1,13 +1,13 @@
</span><span class="cx"> # ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*-
</span><span class="cx"> #
</span><del>-# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
-# Written by Gary V. Vaughan, 2004
</del><ins>+# Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc.
+# Written by Gary V. Vaughan, 2004
</ins><span class="cx"> #
</span><span class="cx"> # This file is free software; the Free Software Foundation gives
</span><span class="cx"> # unlimited permission to copy and/or distribute it, with or without
</span><span class="cx"> # modifications, as long as this notice is preserved.
</span><span class="cx">
</span><del>-# serial 6 ltsugar.m4
</del><ins>+# serial 5 ltsugar.m4
</ins><span class="cx">
</span><span class="cx"> # This is to help aclocal find these macros, as it can't see m4_define.
</span><span class="cx"> AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])])
</span><span class="lines">@@ -63,14 +63,14 @@
</span><span class="cx"> # Produce a SEP delimited list of all paired combinations of elements of
</span><span class="cx"> # PREFIX-LIST with SUFFIX1 through SUFFIXn. Each element of the list
</span><span class="cx"> # has the form PREFIXmINFIXSUFFIXn.
</span><del>-# Needed until we can rely on m4_combine added in Autoconf 2.62.
</del><span class="cx"> m4_define([lt_combine],
</span><del>-[m4_if(m4_eval([$# > 3]), [1],
- [m4_pushdef([_Lt_sep], [m4_define([_Lt_sep], m4_defn([lt_car]))])]]dnl
-[[m4_foreach([_Lt_prefix], [$2],
- [m4_foreach([_Lt_suffix],
- ]m4_dquote(m4_dquote(m4_shift(m4_shift(m4_shift($@)))))[,
- [_Lt_sep([$1])[]m4_defn([_Lt_prefix])[$3]m4_defn([_Lt_suffix])])])])])
</del><ins>+[m4_if([$2], [], [],
+ [m4_if([$4], [], [],
+ [lt_join(m4_quote(m4_default([$1], [[, ]])),
+ lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_prefix, [$2],
+ [m4_foreach(_Lt_suffix, lt_car([m4_shiftn(3, $@)]),
+ [_Lt_prefix[]$3[]_Lt_suffix ])])))))])])dnl
+])
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> # lt_if_append_uniq(MACRO-NAME, VARNAME, [SEPARATOR], [UNIQ], [NOT-UNIQ])
</span></span></pre></div>
<a id="freeswitchtrunklibslibsndfileM4ltversionm4"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/libsndfile/M4/ltversion.m4 (15649 => 15650)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/libsndfile/M4/ltversion.m4 2009-11-24 02:55:34 UTC (rev 15649)
+++ freeswitch/trunk/libs/libsndfile/M4/ltversion.m4 2009-11-24 05:25:16 UTC (rev 15650)
</span><span class="lines">@@ -9,15 +9,15 @@
</span><span class="cx">
</span><span class="cx"> # Generated from ltversion.in.
</span><span class="cx">
</span><del>-# serial 3012 ltversion.m4
</del><ins>+# serial 2976 ltversion.m4
</ins><span class="cx"> # This file is part of GNU Libtool
</span><span class="cx">
</span><del>-m4_define([LT_PACKAGE_VERSION], [2.2.6])
-m4_define([LT_PACKAGE_REVISION], [1.3012])
</del><ins>+m4_define([LT_PACKAGE_VERSION], [2.2.4])
+m4_define([LT_PACKAGE_REVISION], [1.2976])
</ins><span class="cx">
</span><span class="cx"> AC_DEFUN([LTVERSION_VERSION],
</span><del>-[macro_version='2.2.6'
-macro_revision='1.3012'
</del><ins>+[macro_version='2.2.4'
+macro_revision='1.2976'
</ins><span class="cx"> _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
</span><span class="cx"> _LT_DECL(, macro_revision, 0)
</span><span class="cx"> ])
</span></span></pre></div>
<a id="freeswitchtrunklibstiff382configinstallsh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/tiff-3.8.2/config/install-sh (15649 => 15650)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/tiff-3.8.2/config/install-sh 2009-11-24 02:55:34 UTC (rev 15649)
+++ freeswitch/trunk/libs/tiff-3.8.2/config/install-sh 2009-11-24 05:25:16 UTC (rev 15650)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><span class="cx"> #!/bin/sh
</span><span class="cx"> # install - install a program, script, or datafile
</span><span class="cx">
</span><del>-scriptversion=2005-05-14.22
</del><ins>+scriptversion=2006-12-25.00
</ins><span class="cx">
</span><span class="cx"> # This originates from X11R5 (mit/util/scripts/install.sh), which was
</span><span class="cx"> # later released in X11R6 (xc/config/util/install.sh) with the
</span><span class="lines">@@ -39,38 +39,68 @@
</span><span class="cx"> # when there is no Makefile.
</span><span class="cx"> #
</span><span class="cx"> # This script is compatible with the BSD install script, but was written
</span><del>-# from scratch. It can only install one file at a time, a restriction
-# shared with many OS's install programs.
</del><ins>+# from scratch.
</ins><span class="cx">
</span><ins>+nl='
+'
+IFS=" "" $nl"
+
</ins><span class="cx"> # set DOITPROG to echo to test this script
</span><span class="cx">
</span><span class="cx"> # Don't use :- since 4.3BSD and earlier shells don't like it.
</span><del>-doit="${DOITPROG-}"
</del><ins>+doit=${DOITPROG-}
+if test -z "$doit"; then
+ doit_exec=exec
+else
+ doit_exec=$doit
+fi
</ins><span class="cx">
</span><del>-# put in absolute paths if you don't have them in your path; or use env. vars.
</del><ins>+# Put in absolute file names if you don't have them in your path;
+# or use environment vars.
</ins><span class="cx">
</span><del>-mvprog="${MVPROG-mv}"
-cpprog="${CPPROG-cp}"
-chmodprog="${CHMODPROG-chmod}"
-chownprog="${CHOWNPROG-chown}"
-chgrpprog="${CHGRPPROG-chgrp}"
-stripprog="${STRIPPROG-strip}"
-rmprog="${RMPROG-rm}"
-mkdirprog="${MKDIRPROG-mkdir}"
</del><ins>+chgrpprog=${CHGRPPROG-chgrp}
+chmodprog=${CHMODPROG-chmod}
+chownprog=${CHOWNPROG-chown}
+cmpprog=${CMPPROG-cmp}
+cpprog=${CPPROG-cp}
+mkdirprog=${MKDIRPROG-mkdir}
+mvprog=${MVPROG-mv}
+rmprog=${RMPROG-rm}
+stripprog=${STRIPPROG-strip}
</ins><span class="cx">
</span><del>-chmodcmd="$chmodprog 0755"
</del><ins>+posix_glob='?'
+initialize_posix_glob='
+ test "$posix_glob" != "?" || {
+ if (set -f) 2>/dev/null; then
+ posix_glob=
+ else
+ posix_glob=:
+ fi
+ }
+'
+
+posix_mkdir=
+
+# Desired mode of installed file.
+mode=0755
+
+chgrpcmd=
+chmodcmd=$chmodprog
</ins><span class="cx"> chowncmd=
</span><del>-chgrpcmd=
</del><ins>+mvcmd=$mvprog
+rmcmd="$rmprog -f"
</ins><span class="cx"> stripcmd=
</span><del>-rmcmd="$rmprog -f"
-mvcmd="$mvprog"
</del><ins>+
</ins><span class="cx"> src=
</span><span class="cx"> dst=
</span><span class="cx"> dir_arg=
</span><del>-dstarg=
</del><ins>+dst_arg=
+
+copy_on_change=false
</ins><span class="cx"> no_target_directory=
</span><span class="cx">
</span><del>-usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
</del><ins>+usage="\
+Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
</ins><span class="cx"> or: $0 [OPTION]... SRCFILES... DIRECTORY
</span><span class="cx"> or: $0 [OPTION]... -t DIRECTORY SRCFILES...
</span><span class="cx"> or: $0 [OPTION]... -d DIRECTORIES...
</span><span class="lines">@@ -80,81 +110,86 @@
</span><span class="cx"> In the 4th, create DIRECTORIES.
</span><span class="cx">
</span><span class="cx"> Options:
</span><del>--c (ignored)
--d create directories instead of installing files.
--g GROUP $chgrpprog installed files to GROUP.
--m MODE $chmodprog installed files to MODE.
--o USER $chownprog installed files to USER.
--s $stripprog installed files.
--t DIRECTORY install into DIRECTORY.
--T report an error if DSTFILE is a directory.
---help display this help and exit.
---version display version info and exit.
</del><ins>+ --help display this help and exit.
+ --version display version info and exit.
</ins><span class="cx">
</span><ins>+ -c (ignored)
+ -C install only if different (preserve the last data modification time)
+ -d create directories instead of installing files.
+ -g GROUP $chgrpprog installed files to GROUP.
+ -m MODE $chmodprog installed files to MODE.
+ -o USER $chownprog installed files to USER.
+ -s $stripprog installed files.
+ -t DIRECTORY install into DIRECTORY.
+ -T report an error if DSTFILE is a directory.
+
</ins><span class="cx"> Environment variables override the default commands:
</span><del>- CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
</del><ins>+ CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
+ RMPROG STRIPPROG
</ins><span class="cx"> "
</span><span class="cx">
</span><del>-while test -n "$1"; do
</del><ins>+while test $# -ne 0; do
</ins><span class="cx"> case $1 in
</span><del>- -c) shift
- continue;;
</del><ins>+ -c) ;;
</ins><span class="cx">
</span><del>- -d) dir_arg=true
- shift
- continue;;
</del><ins>+ -C) copy_on_change=true;;
</ins><span class="cx">
</span><ins>+ -d) dir_arg=true;;
+
</ins><span class="cx"> -g) chgrpcmd="$chgrpprog $2"
</span><del>- shift
- shift
- continue;;
</del><ins>+ shift;;
</ins><span class="cx">
</span><span class="cx"> --help) echo "$usage"; exit $?;;
</span><span class="cx">
</span><del>- -m) chmodcmd="$chmodprog $2"
- shift
- shift
- continue;;
</del><ins>+ -m) mode=$2
+ case $mode in
+ *' '* | *' '* | *'
+'* | *'*'* | *'?'* | *'['*)
+ echo "$0: invalid mode: $mode" >&2
+ exit 1;;
+ esac
+ shift;;
</ins><span class="cx">
</span><span class="cx"> -o) chowncmd="$chownprog $2"
</span><del>- shift
- shift
- continue;;
</del><ins>+ shift;;
</ins><span class="cx">
</span><del>- -s) stripcmd=$stripprog
- shift
- continue;;
</del><ins>+ -s) stripcmd=$stripprog;;
</ins><span class="cx">
</span><del>- -t) dstarg=$2
- shift
- shift
- continue;;
</del><ins>+ -t) dst_arg=$2
+ shift;;
</ins><span class="cx">
</span><del>- -T) no_target_directory=true
- shift
- continue;;
</del><ins>+ -T) no_target_directory=true;;
</ins><span class="cx">
</span><span class="cx"> --version) echo "$0 $scriptversion"; exit $?;;
</span><span class="cx">
</span><del>- *) # When -d is used, all remaining arguments are directories to create.
- # When -t is used, the destination is already specified.
- test -n "$dir_arg$dstarg" && break
- # Otherwise, the last argument is the destination. Remove it from $@.
- for arg
- do
- if test -n "$dstarg"; then
- # $@ is not empty: it contains at least $arg.
- set fnord "$@" "$dstarg"
- shift # fnord
- fi
- shift # arg
- dstarg=$arg
- done
</del><ins>+ --) shift
</ins><span class="cx"> break;;
</span><ins>+
+ -*) echo "$0: invalid option: $1" >&2
+ exit 1;;
+
+ *) break;;
</ins><span class="cx"> esac
</span><ins>+ shift
</ins><span class="cx"> done
</span><span class="cx">
</span><del>-if test -z "$1"; then
</del><ins>+if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
+ # When -d is used, all remaining arguments are directories to create.
+ # When -t is used, the destination is already specified.
+ # Otherwise, the last argument is the destination. Remove it from $@.
+ for arg
+ do
+ if test -n "$dst_arg"; then
+ # $@ is not empty: it contains at least $arg.
+ set fnord "$@" "$dst_arg"
+ shift # fnord
+ fi
+ shift # arg
+ dst_arg=$arg
+ done
+fi
+
+if test $# -eq 0; then
</ins><span class="cx"> if test -z "$dir_arg"; then
</span><span class="cx"> echo "$0: no input file specified." >&2
</span><span class="cx"> exit 1
</span><span class="lines">@@ -164,24 +199,47 @@
</span><span class="cx"> exit 0
</span><span class="cx"> fi
</span><span class="cx">
</span><ins>+if test -z "$dir_arg"; then
+ trap '(exit $?); exit' 1 2 13 15
+
+ # Set umask so as not to create temps with too-generous modes.
+ # However, 'strip' requires both read and write access to temps.
+ case $mode in
+ # Optimize common cases.
+ *644) cp_umask=133;;
+ *755) cp_umask=22;;
+
+ *[0-7])
+ if test -z "$stripcmd"; then
+ u_plus_rw=
+ else
+ u_plus_rw='% 200'
+ fi
+ cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
+ *)
+ if test -z "$stripcmd"; then
+ u_plus_rw=
+ else
+ u_plus_rw=,u+rw
+ fi
+ cp_umask=$mode$u_plus_rw;;
+ esac
+fi
+
</ins><span class="cx"> for src
</span><span class="cx"> do
</span><span class="cx"> # Protect names starting with `-'.
</span><span class="cx"> case $src in
</span><del>- -*) src=./$src ;;
</del><ins>+ -*) src=./$src;;
</ins><span class="cx"> esac
</span><span class="cx">
</span><span class="cx"> if test -n "$dir_arg"; then
</span><span class="cx"> dst=$src
</span><del>- src=
</del><ins>+ dstdir=$dst
+ test -d "$dstdir"
+ dstdir_status=$?
+ else
</ins><span class="cx">
</span><del>- if test -d "$dst"; then
- mkdircmd=:
- chmodcmd=
- else
- mkdircmd=$mkdirprog
- fi
- else
</del><span class="cx"> # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
</span><span class="cx"> # might cause directories to be created, which would be especially bad
</span><span class="cx"> # if $src (and thus $dsttmp) contains '*'.
</span><span class="lines">@@ -190,71 +248,199 @@
</span><span class="cx"> exit 1
</span><span class="cx"> fi
</span><span class="cx">
</span><del>- if test -z "$dstarg"; then
</del><ins>+ if test -z "$dst_arg"; then
</ins><span class="cx"> echo "$0: no destination specified." >&2
</span><span class="cx"> exit 1
</span><span class="cx"> fi
</span><span class="cx">
</span><del>- dst=$dstarg
</del><ins>+ dst=$dst_arg
</ins><span class="cx"> # Protect names starting with `-'.
</span><span class="cx"> case $dst in
</span><del>- -*) dst=./$dst ;;
</del><ins>+ -*) dst=./$dst;;
</ins><span class="cx"> esac
</span><span class="cx">
</span><span class="cx"> # If destination is a directory, append the input filename; won't work
</span><span class="cx"> # if double slashes aren't ignored.
</span><span class="cx"> if test -d "$dst"; then
</span><span class="cx"> if test -n "$no_target_directory"; then
</span><del>- echo "$0: $dstarg: Is a directory" >&2
</del><ins>+ echo "$0: $dst_arg: Is a directory" >&2
</ins><span class="cx"> exit 1
</span><span class="cx"> fi
</span><del>- dst=$dst/`basename "$src"`
</del><ins>+ dstdir=$dst
+ dst=$dstdir/`basename "$src"`
+ dstdir_status=0
+ else
+ # Prefer dirname, but fall back on a substitute if dirname fails.
+ dstdir=`
+ (dirname "$dst") 2>/dev/null ||
+ expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$dst" : 'X\(//\)[^/]' \| \
+ X"$dst" : 'X\(//\)$' \| \
+ X"$dst" : 'X\(/\)' \| . 2>/dev/null ||
+ echo X"$dst" |
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)[^/].*/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\).*/{
+ s//\1/
+ q
+ }
+ s/.*/./; q'
+ `
+
+ test -d "$dstdir"
+ dstdir_status=$?
</ins><span class="cx"> fi
</span><span class="cx"> fi
</span><span class="cx">
</span><del>- # This sed command emulates the dirname command.
- dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'`
</del><ins>+ obsolete_mkdir_used=false
</ins><span class="cx">
</span><del>- # Make sure that the destination directory exists.
</del><ins>+ if test $dstdir_status != 0; then
+ case $posix_mkdir in
+ '')
+ # Create intermediate dirs using mode 755 as modified by the umask.
+ # This is like FreeBSD 'install' as of 1997-10-28.
+ umask=`umask`
+ case $stripcmd.$umask in
+ # Optimize common cases.
+ *[2367][2367]) mkdir_umask=$umask;;
+ .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
</ins><span class="cx">
</span><del>- # Skip lots of stat calls in the usual case.
- if test ! -d "$dstdir"; then
- defaultIFS='
- '
- IFS="${IFS-$defaultIFS}"
</del><ins>+ *[0-7])
+ mkdir_umask=`expr $umask + 22 \
+ - $umask % 100 % 40 + $umask % 20 \
+ - $umask % 10 % 4 + $umask % 2
+ `;;
+ *) mkdir_umask=$umask,go-w;;
+ esac
</ins><span class="cx">
</span><del>- oIFS=$IFS
- # Some sh's can't handle IFS=/ for some reason.
- IFS='%'
- set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
- shift
- IFS=$oIFS
</del><ins>+ # With -d, create the new directory with the user-specified mode.
+ # Otherwise, rely on $mkdir_umask.
+ if test -n "$dir_arg"; then
+ mkdir_mode=-m$mode
+ else
+ mkdir_mode=
+ fi
</ins><span class="cx">
</span><del>- pathcomp=
</del><ins>+ posix_mkdir=false
+ case $umask in
+ *[123567][0-7][0-7])
+ # POSIX mkdir -p sets u+wx bits regardless of umask, which
+ # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
+ ;;
+ *)
+ tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
+ trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
</ins><span class="cx">
</span><del>- while test $# -ne 0 ; do
- pathcomp=$pathcomp$1
</del><ins>+ if (umask $mkdir_umask &&
+ exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
+ then
+ if test -z "$dir_arg" || {
+ # Check for POSIX incompatibilities with -m.
+ # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
+ # other-writeable bit of parent directory when it shouldn't.
+ # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
+ ls_ld_tmpdir=`ls -ld "$tmpdir"`
+ case $ls_ld_tmpdir in
+ d????-?r-*) different_mode=700;;
+ d????-?--*) different_mode=755;;
+ *) false;;
+ esac &&
+ $mkdirprog -m$different_mode -p -- "$tmpdir" && {
+ ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
+ test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
+ }
+ }
+ then posix_mkdir=:
+ fi
+ rmdir "$tmpdir/d" "$tmpdir"
+ else
+ # Remove any dirs left behind by ancient mkdir implementations.
+ rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
+ fi
+ trap '' 0;;
+ esac;;
+ esac
+
+ if
+ $posix_mkdir && (
+ umask $mkdir_umask &&
+ $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
+ )
+ then :
+ else
+
+ # The umask is ridiculous, or mkdir does not conform to POSIX,
+ # or it failed possibly due to a race condition. Create the
+ # directory the slow way, step by step, checking for races as we go.
+
+ case $dstdir in
+ /*) prefix='/';;
+ -*) prefix='./';;
+ *) prefix='';;
+ esac
+
+ eval "$initialize_posix_glob"
+
+ oIFS=$IFS
+ IFS=/
+ $posix_glob set -f
+ set fnord $dstdir
</ins><span class="cx"> shift
</span><del>- if test ! -d "$pathcomp"; then
- $mkdirprog "$pathcomp"
- # mkdir can fail with a `File exist' error in case several
- # install-sh are creating the directory concurrently. This
- # is OK.
- test -d "$pathcomp" || exit
</del><ins>+ $posix_glob set +f
+ IFS=$oIFS
+
+ prefixes=
+
+ for d
+ do
+ test -z "$d" && continue
+
+ prefix=$prefix$d
+ if test -d "$prefix"; then
+ prefixes=
+ else
+ if $posix_mkdir; then
+ (umask=$mkdir_umask &&
+ $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
+ # Don't fail if two instances are running concurrently.
+ test -d "$prefix" || exit 1
+ else
+ case $prefix in
+ *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
+ *) qprefix=$prefix;;
+ esac
+ prefixes="$prefixes '$qprefix'"
+ fi
+ fi
+ prefix=$prefix/
+ done
+
+ if test -n "$prefixes"; then
+ # Don't fail if two instances are running concurrently.
+ (umask $mkdir_umask &&
+ eval "\$doit_exec \$mkdirprog $prefixes") ||
+ test -d "$dstdir" || exit 1
+ obsolete_mkdir_used=true
</ins><span class="cx"> fi
</span><del>- pathcomp=$pathcomp/
- done
</del><ins>+ fi
</ins><span class="cx"> fi
</span><span class="cx">
</span><span class="cx"> if test -n "$dir_arg"; then
</span><del>- $doit $mkdircmd "$dst" \
- && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \
- && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \
- && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \
- && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; }
-
</del><ins>+ { test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
+ { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
+ { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
+ test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1
</ins><span class="cx"> else
</span><del>- dstfile=`basename "$dst"`
</del><span class="cx">
</span><span class="cx"> # Make a couple of temp file names in the proper directory.
</span><span class="cx"> dsttmp=$dstdir/_inst.$$_
</span><span class="lines">@@ -262,10 +448,9 @@
</span><span class="cx">
</span><span class="cx"> # Trap to clean up those temp files at exit.
</span><span class="cx"> trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
</span><del>- trap '(exit $?); exit' 1 2 13 15
</del><span class="cx">
</span><span class="cx"> # Copy the file name to the temp name.
</span><del>- $doit $cpprog "$src" "$dsttmp" &&
</del><ins>+ (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
</ins><span class="cx">
</span><span class="cx"> # and set any options; do chmod last to preserve setuid bits.
</span><span class="cx"> #
</span><span class="lines">@@ -273,48 +458,59 @@
</span><span class="cx"> # ignore errors from any of these, just make sure not to ignore
</span><span class="cx"> # errors from the above "$doit $cpprog $src $dsttmp" command.
</span><span class="cx"> #
</span><del>- { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
- && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
- && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
- && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } &&
</del><ins>+ { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } &&
+ { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } &&
+ { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } &&
+ { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
</ins><span class="cx">
</span><del>- # Now rename the file to the real destination.
- { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \
- || {
- # The rename failed, perhaps because mv can't rename something else
- # to itself, or perhaps because mv is so ancient that it does not
- # support -f.
</del><ins>+ # If -C, don't bother to copy if it wouldn't change the file.
+ if $copy_on_change &&
+ old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` &&
+ new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` &&
</ins><span class="cx">
</span><del>- # Now remove or move aside any old file at destination location.
- # We try this two ways since rm can't unlink itself on some
- # systems and the destination file might be busy for other
- # reasons. In this case, the final cleanup might fail but the new
- # file should still install successfully.
- {
- if test -f "$dstdir/$dstfile"; then
- $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \
- || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \
- || {
- echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
- (exit 1); exit 1
- }
- else
- :
- fi
- } &&
</del><ins>+ eval "$initialize_posix_glob" &&
+ $posix_glob set -f &&
+ set X $old && old=:$2:$4:$5:$6 &&
+ set X $new && new=:$2:$4:$5:$6 &&
+ $posix_glob set +f &&
</ins><span class="cx">
</span><del>- # Now rename the file to the real destination.
- $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
- }
- }
- fi || { (exit 1); exit 1; }
</del><ins>+ test "$old" = "$new" &&
+ $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
+ then
+ rm -f "$dsttmp"
+ else
+ # Rename the file to the real destination.
+ $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
+
+ # The rename failed, perhaps because mv can't rename something else
+ # to itself, or perhaps because mv is so ancient that it does not
+ # support -f.
+ {
+ # Now remove or move aside any old file at destination location.
+ # We try this two ways since rm can't unlink itself on some
+ # systems and the destination file might be busy for other
+ # reasons. In this case, the final cleanup might fail but the new
+ # file should still install successfully.
+ {
+ test ! -f "$dst" ||
+ $doit $rmcmd -f "$dst" 2>/dev/null ||
+ { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
+ { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
+ } ||
+ { echo "$0: cannot unlink or rename $dst" >&2
+ (exit 1); exit 1
+ }
+ } &&
+
+ # Now rename the file to the real destination.
+ $doit $mvcmd "$dsttmp" "$dst"
+ }
+ fi || exit 1
+
+ trap '' 0
+ fi
</ins><span class="cx"> done
</span><span class="cx">
</span><del>-# The final little trick to "correctly" pass the exit status to the exit trap.
-{
- (exit 0); exit 0
-}
-
</del><span class="cx"> # Local variables:
</span><span class="cx"> # eval: (add-hook 'write-file-hooks 'time-stamp)
</span><span class="cx"> # time-stamp-start: "scriptversion="
</span></span></pre></div>
<a id="freeswitchtrunksrcmodlanguagesmod_spidermonkeysmmak"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/sm.mak (15649 => 15650)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/languages/mod_spidermonkey/sm.mak 2009-11-24 02:55:34 UTC (rev 15649)
+++ freeswitch/trunk/src/mod/languages/mod_spidermonkey/sm.mak 2009-11-24 05:25:16 UTC (rev 15650)
</span><span class="lines">@@ -3,7 +3,7 @@
</span><span class="cx"> JSLA=$(JS_DIR)/libjs.la
</span><span class="cx">
</span><span class="cx"> LOCAL_CFLAGS+=-I$(JS_DIR)/src -I$(JS_DIR)/nsprpub/dist/include/nspr -DXP_UNIX -I../mod_spidermonkey -DJS_THREADSAFE -DJS_HAS_FILE_OBJECT=1 -DJS_HAS_XML_SUPPORT=1
</span><del>-LOCAL_LDFLAGS_POST=$(JS_DIR)/nsprpub/pr/src/libnspr4.*
</del><ins>+LOCAL_LDFLAGS_POST=-L$(JS_DIR)/nsprpub/dist/lib -lnspr4 $(JS_DIR)/nsprpub/pr/src/libnspr4.*
</ins><span class="cx"> LOCAL_LIBADD+=$(JSLA)
</span><span class="cx">
</span><span class="cx"> include $(switch_srcdir)/build/modmake.rules
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>