Re: [Opalvoip-svn] SF.net SVN: opalvoip:[29142] ptlib/trunk
Brought to you by:
csoutheren,
rjongbloed
From: Robert J. <ro...@vo...> - 2013-02-19 01:41:50
|
Implication is you only intended to back out the vidfile changes? What's the other changes? *Robert Jongbloed* /OPAL/OpenH323/PTLib Architect and Co-founder./ Commercial support at http://www.voxlucida.com.au On 18/02/2013 9:57 PM, cso...@us... wrote: > Revision: 29142 > http://opalvoip.svn.sourceforge.net/opalvoip/?rev=29142&view=rev > Author: csoutheren > Date: 2013-02-18 10:57:42 +0000 (Mon, 18 Feb 2013) > Log Message: > ----------- > Reverted last change - lots more work required > > Modified Paths: > -------------- > ptlib/trunk/configure > ptlib/trunk/include/ptclib/pvidfile.h > ptlib/trunk/include/ptlib/critsec.h > ptlib/trunk/samples/javascript/js_test.cxx > ptlib/trunk/src/ptclib/jscript.cxx > ptlib/trunk/src/ptclib/pvidfile.cxx > > Modified: ptlib/trunk/configure > =================================================================== > --- ptlib/trunk/configure 2013-02-18 08:06:31 UTC (rev 29141) > +++ ptlib/trunk/configure 2013-02-18 10:57:42 UTC (rev 29142) > @@ -1,9 +1,11 @@ > #! /bin/sh > # Guess values for system-dependent variables and create Makefiles. > -# Generated by GNU Autoconf 2.69. > +# Generated by GNU Autoconf 2.68. > # > # > -# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. > +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, > +# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software > +# Foundation, Inc. > # > # > # This configure script is free software; the Free Software Foundation > @@ -132,31 +134,6 @@ > # CDPATH. > (unset CDPATH) >/dev/null 2>&1 && unset CDPATH > > -# Use a proper internal environment variable to ensure we don't fall > - # into an infinite loop, continuously re-executing ourselves. > - if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then > - _as_can_reexec=no; export _as_can_reexec; > - # We cannot yet assume a decent shell, so we have to provide a > -# neutralization value for shells without unset; and this also > -# works around shells that cannot unset nonexistent variables. > -# Preserve -v and -x to the replacement shell. > -BASH_ENV=/dev/null > -ENV=/dev/null > -(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV > -case $- in # (((( > - *v*x* | *x*v* ) as_opts=-vx ;; > - *v* ) as_opts=-v ;; > - *x* ) as_opts=-x ;; > - * ) as_opts= ;; > -esac > -exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} > -# Admittedly, this is quite paranoid, since all the known shells bail > -# out after a failed `exec'. > -$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 > -as_fn_exit 255 > - fi > - # We don't want this to propagate to other subprocesses. > - { _as_can_reexec=; unset _as_can_reexec;} > if test "x$CONFIG_SHELL" = x; then > as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : > emulate sh > @@ -190,8 +167,7 @@ > else > exitcode=1; echo positional parameters were not saved. > fi > -test x\$exitcode = x0 || exit 1 > -test -x / || exit 1" > +test x\$exitcode = x0 || exit 1" > as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO > as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO > eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && > @@ -236,25 +212,21 @@ > > > if test "x$CONFIG_SHELL" != x; then : > - export CONFIG_SHELL > - # We cannot yet assume a decent shell, so we have to provide a > -# neutralization value for shells without unset; and this also > -# works around shells that cannot unset nonexistent variables. > -# Preserve -v and -x to the replacement shell. > -BASH_ENV=/dev/null > -ENV=/dev/null > -(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV > -case $- in # (((( > - *v*x* | *x*v* ) as_opts=-vx ;; > - *v* ) as_opts=-v ;; > - *x* ) as_opts=-x ;; > - * ) as_opts= ;; > -esac > -exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} > -# Admittedly, this is quite paranoid, since all the known shells bail > -# out after a failed `exec'. > -$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 > -exit 255 > + # We cannot yet assume a decent shell, so we have to provide a > + # neutralization value for shells without unset; and this also > + # works around shells that cannot unset nonexistent variables. > + # Preserve -v and -x to the replacement shell. > + BASH_ENV=/dev/null > + ENV=/dev/null > + (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV > + export CONFIG_SHELL > + case $- in # (((( > + *v*x* | *x*v* ) as_opts=-vx ;; > + *v* ) as_opts=-v ;; > + *x* ) as_opts=-x ;; > + * ) as_opts= ;; > + esac > + exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"} > fi > > if test x$as_have_required = xno; then : > @@ -356,14 +328,6 @@ > > > } # as_fn_mkdir_p > - > -# as_fn_executable_p FILE > -# ----------------------- > -# Test if FILE is an executable regular file. > -as_fn_executable_p () > -{ > - test -f "$1" && test -x "$1" > -} # as_fn_executable_p > # as_fn_append VAR VALUE > # ---------------------- > # Append the text in VALUE to the end of the definition contained in VAR. Take > @@ -485,10 +449,6 @@ > chmod +x "$as_me.lineno" || > { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } > > - # If we had to re-execute with $CONFIG_SHELL, we're ensured to have > - # already done that, so ensure we don't try to do so again and fall > - # in an infinite loop. This has already happened in practice. > - _as_can_reexec=no; export _as_can_reexec > # Don't try to exec as it changes $[0], causing all sort of problems > # (the dirname of $[0] is not the place where we might find the > # original and so on. Autoconf is especially sensitive to this). > @@ -523,16 +483,16 @@ > # ... but there are two gotchas: > # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. > # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. > - # In both cases, we have to default to `cp -pR'. > + # In both cases, we have to default to `cp -p'. > ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || > - as_ln_s='cp -pR' > + as_ln_s='cp -p' > elif ln conf$$.file conf$$ 2>/dev/null; then > as_ln_s=ln > else > - as_ln_s='cp -pR' > + as_ln_s='cp -p' > fi > else > - as_ln_s='cp -pR' > + as_ln_s='cp -p' > fi > rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file > rmdir conf$$.dir 2>/dev/null > @@ -544,8 +504,28 @@ > as_mkdir_p=false > fi > > -as_test_x='test -x' > -as_executable_p=as_fn_executable_p > +if test -x / >/dev/null 2>&1; then > + as_test_x='test -x' > +else > + if ls -dL / >/dev/null 2>&1; then > + as_ls_L_option=L > + else > + as_ls_L_option= > + fi > + as_test_x=' > + eval sh -c '\'' > + if test -d "$1"; then > + test -d "$1/."; > + else > + case $1 in #( > + -*)set "./$1";; > + esac; > + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( > + ???[sx]*):;;*)false;;esac;fi > + '\'' sh > + ' > +fi > +as_executable_p=$as_test_x > > # Sed expression to map a string onto a valid CPP name. > as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" > @@ -1408,6 +1388,8 @@ > if test "x$host_alias" != x; then > if test "x$build_alias" = x; then > cross_compiling=maybe > + $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. > + If a cross compiler is detected then cross compile mode will be used" >&2 > elif test "x$build_alias" != "x$host_alias"; then > cross_compiling=yes > fi > @@ -1756,9 +1738,9 @@ > if $ac_init_version; then > cat <<\_ACEOF > configure > -generated by GNU Autoconf 2.69 > +generated by GNU Autoconf 2.68 > > -Copyright (C) 2012 Free Software Foundation, Inc. > +Copyright (C) 2010 Free Software Foundation, Inc. > This configure script is free software; the Free Software Foundation > gives unlimited permission to copy, distribute and modify it. > _ACEOF > @@ -1982,7 +1964,7 @@ > test ! -s conftest.err > } && test -s conftest$ac_exeext && { > test "$cross_compiling" = yes || > - test -x conftest$ac_exeext > + $as_test_x conftest$ac_exeext > }; then : > ac_retval=0 > else > @@ -2085,8 +2067,7 @@ > main () > { > static int test_array [1 - 2 * !(($2) >= 0)]; > -test_array [0] = 0; > -return test_array [0]; > +test_array [0] = 0 > > ; > return 0; > @@ -2102,8 +2083,7 @@ > main () > { > static int test_array [1 - 2 * !(($2) <= $ac_mid)]; > -test_array [0] = 0; > -return test_array [0]; > +test_array [0] = 0 > > ; > return 0; > @@ -2129,8 +2109,7 @@ > main () > { > static int test_array [1 - 2 * !(($2) < 0)]; > -test_array [0] = 0; > -return test_array [0]; > +test_array [0] = 0 > > ; > return 0; > @@ -2146,8 +2125,7 @@ > main () > { > static int test_array [1 - 2 * !(($2) >= $ac_mid)]; > -test_array [0] = 0; > -return test_array [0]; > +test_array [0] = 0 > > ; > return 0; > @@ -2181,8 +2159,7 @@ > main () > { > static int test_array [1 - 2 * !(($2) <= $ac_mid)]; > -test_array [0] = 0; > -return test_array [0]; > +test_array [0] = 0 > > ; > return 0; > @@ -2489,7 +2466,7 @@ > test ! -s conftest.err > } && test -s conftest$ac_exeext && { > test "$cross_compiling" = yes || > - test -x conftest$ac_exeext > + $as_test_x conftest$ac_exeext > }; then : > ac_retval=0 > else > @@ -2610,7 +2587,7 @@ > running configure, to aid debugging if configure makes a mistake. > > It was created by $as_me, which was > -generated by GNU Autoconf 2.69. Invocation command line was > +generated by GNU Autoconf 2.68. Invocation command line was > > $ $0 $@ > > @@ -3050,7 +3027,7 @@ > IFS=$as_save_IFS > test -z "$as_dir" && as_dir=. > for ac_exec_ext in '' $ac_executable_extensions; do > - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then > + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then > ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" > $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 > break 2 > @@ -3093,7 +3070,7 @@ > IFS=$as_save_IFS > test -z "$as_dir" && as_dir=. > for ac_exec_ext in '' $ac_executable_extensions; do > - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then > + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then > ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" > $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 > break 2 > @@ -3455,7 +3432,7 @@ > IFS=$as_save_IFS > test -z "$as_dir" && as_dir=. > for ac_exec_ext in '' $ac_executable_extensions; do > - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then > + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then > ac_cv_prog_CC="${ac_tool_prefix}gcc" > $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 > break 2 > @@ -3495,7 +3472,7 @@ > IFS=$as_save_IFS > test -z "$as_dir" && as_dir=. > for ac_exec_ext in '' $ac_executable_extensions; do > - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then > + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then > ac_cv_prog_ac_ct_CC="gcc" > $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 > break 2 > @@ -3548,7 +3525,7 @@ > IFS=$as_save_IFS > test -z "$as_dir" && as_dir=. > for ac_exec_ext in '' $ac_executable_extensions; do > - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then > + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then > ac_cv_prog_CC="${ac_tool_prefix}cc" > $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 > break 2 > @@ -3589,7 +3566,7 @@ > IFS=$as_save_IFS > test -z "$as_dir" && as_dir=. > for ac_exec_ext in '' $ac_executable_extensions; do > - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then > + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then > if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then > ac_prog_rejected=yes > continue > @@ -3647,7 +3624,7 @@ > IFS=$as_save_IFS > test -z "$as_dir" && as_dir=. > for ac_exec_ext in '' $ac_executable_extensions; do > - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then > + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then > ac_cv_prog_CC="$ac_tool_prefix$ac_prog" > $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 > break 2 > @@ -3691,7 +3668,7 @@ > IFS=$as_save_IFS > test -z "$as_dir" && as_dir=. > for ac_exec_ext in '' $ac_executable_extensions; do > - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then > + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then > ac_cv_prog_ac_ct_CC="$ac_prog" > $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 > break 2 > @@ -4137,7 +4114,8 @@ > /* end confdefs.h. */ > #include <stdarg.h> > #include <stdio.h> > -struct stat; > +#include <sys/types.h> > +#include <sys/stat.h> > /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ > struct buf { int x; }; > FILE * (*rcsopen) (struct buf *, struct stat *, int); > @@ -4439,7 +4417,7 @@ > IFS=$as_save_IFS > test -z "$as_dir" && as_dir=. > for ac_exec_ext in '' $ac_executable_extensions; do > - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then > + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then > ac_cv_prog_CC="${ac_tool_prefix}gcc" > $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 > break 2 > @@ -4479,7 +4457,7 @@ > IFS=$as_save_IFS > test -z "$as_dir" && as_dir=. > for ac_exec_ext in '' $ac_executable_extensions; do > - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then > + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then > ac_cv_prog_ac_ct_CC="gcc" > $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 > break 2 > @@ -4532,7 +4510,7 @@ > IFS=$as_save_IFS > test -z "$as_dir" && as_dir=. > for ac_exec_ext in '' $ac_executable_extensions; do > - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then > + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then > ac_cv_prog_CC="${ac_tool_prefix}cc" > $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 > break 2 > @@ -4573,7 +4551,7 @@ > IFS=$as_save_IFS > test -z "$as_dir" && as_dir=. > for ac_exec_ext in '' $ac_executable_extensions; do > - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then > + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then > if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then > ac_prog_rejected=yes > continue > @@ -4631,7 +4609,7 @@ > IFS=$as_save_IFS > test -z "$as_dir" && as_dir=. > for ac_exec_ext in '' $ac_executable_extensions; do > - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then > + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then > ac_cv_prog_CC="$ac_tool_prefix$ac_prog" > $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 > break 2 > @@ -4675,7 +4653,7 @@ > IFS=$as_save_IFS > test -z "$as_dir" && as_dir=. > for ac_exec_ext in '' $ac_executable_extensions; do > - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then > + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then > ac_cv_prog_ac_ct_CC="$ac_prog" > $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 > break 2 > @@ -4871,7 +4849,8 @@ > /* end confdefs.h. */ > #include <stdarg.h> > #include <stdio.h> > -struct stat; > +#include <sys/types.h> > +#include <sys/stat.h> > /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ > struct buf { int x; }; > FILE * (*rcsopen) (struct buf *, struct stat *, int); > @@ -4984,7 +4963,7 @@ > IFS=$as_save_IFS > test -z "$as_dir" && as_dir=. > for ac_exec_ext in '' $ac_executable_extensions; do > - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then > + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then > ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" > $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 > break 2 > @@ -5028,7 +5007,7 @@ > IFS=$as_save_IFS > test -z "$as_dir" && as_dir=. > for ac_exec_ext in '' $ac_executable_extensions; do > - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then > + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then > ac_cv_prog_ac_ct_CXX="$ac_prog" > $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 > break 2 > @@ -5588,7 +5567,7 @@ > for ac_prog in grep ggrep; do > for ac_exec_ext in '' $ac_executable_extensions; do > ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" > - as_fn_executable_p "$ac_path_GREP" || continue > + { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue > # Check for GNU ac_path_GREP and select it if it is found. > # Check for GNU $ac_path_GREP > case `"$ac_path_GREP" --version 2>&1` in > @@ -5654,7 +5633,7 @@ > for ac_prog in egrep; do > for ac_exec_ext in '' $ac_executable_extensions; do > ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" > - as_fn_executable_p "$ac_path_EGREP" || continue > + { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue > # Check for GNU ac_path_EGREP and select it if it is found. > # Check for GNU $ac_path_EGREP > case `"$ac_path_EGREP" --version 2>&1` in > @@ -6288,8 +6267,7 @@ > - (LDBL_MANT_DIG < DBL_MANT_DIG))) > && (int) LDBL_EPSILON == 0 > )]; > -test_array [0] = 0; > -return test_array [0]; > +test_array [0] = 0 > > ; > return 0; > @@ -6342,7 +6320,7 @@ > IFS=$as_save_IFS > test -z "$as_dir" && as_dir=. > for ac_exec_ext in '' $ac_executable_extensions; do > - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then > + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then > ac_cv_path_FLEX="$as_dir/$ac_word$ac_exec_ext" > $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 > break 2 > @@ -6385,7 +6363,7 @@ > IFS=$as_save_IFS > test -z "$as_dir" && as_dir=. > for ac_exec_ext in '' $ac_executable_extensions; do > - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then > + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then > ac_cv_prog_AR="${ac_tool_prefix}ar" > $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 > break 2 > @@ -6425,7 +6403,7 @@ > IFS=$as_save_IFS > test -z "$as_dir" && as_dir=. > for ac_exec_ext in '' $ac_executable_extensions; do > - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then > + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then > ac_cv_prog_ac_ct_AR="ar" > $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 > break 2 > @@ -6478,7 +6456,7 @@ > IFS=$as_save_IFS > test -z "$as_dir" && as_dir=. > for ac_exec_ext in '' $ac_executable_extensions; do > - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then > + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then > ac_cv_prog_AR="${ac_tool_prefix}gar" > $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 > break 2 > @@ -6518,7 +6496,7 @@ > IFS=$as_save_IFS > test -z "$as_dir" && as_dir=. > for ac_exec_ext in '' $ac_executable_extensions; do > - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then > + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then > ac_cv_prog_ac_ct_AR="gar" > $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 > break 2 > @@ -6573,7 +6551,7 @@ > IFS=$as_save_IFS > test -z "$as_dir" && as_dir=. > for ac_exec_ext in '' $ac_executable_extensions; do > - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then > + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then > ac_cv_path_BISON="$as_dir/$ac_word$ac_exec_ext" > $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 > break 2 > @@ -6616,7 +6594,7 @@ > IFS=$as_save_IFS > test -z "$as_dir" && as_dir=. > for ac_exec_ext in '' $ac_executable_extensions; do > - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then > + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then > ac_cv_prog_SVN="${ac_tool_prefix}svn" > $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 > break 2 > @@ -6656,7 +6634,7 @@ > IFS=$as_save_IFS > test -z "$as_dir" && as_dir=. > for ac_exec_ext in '' $ac_executable_extensions; do > - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then > + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then > ac_cv_prog_ac_ct_SVN="svn" > $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 > break 2 > @@ -13428,7 +13406,7 @@ > # by default. > for ac_prog in ginstall scoinst install; do > for ac_exec_ext in '' $ac_executable_extensions; do > - if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then > + if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then > if test $ac_prog = install && > grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then > # AIX install. It has an incompatible calling convention. > @@ -13909,16 +13887,16 @@ > # ... but there are two gotchas: > # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. > # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. > - # In both cases, we have to default to `cp -pR'. > + # In both cases, we have to default to `cp -p'. > ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || > - as_ln_s='cp -pR' > + as_ln_s='cp -p' > elif ln conf$$.file conf$$ 2>/dev/null; then > as_ln_s=ln > else > - as_ln_s='cp -pR' > + as_ln_s='cp -p' > fi > else > - as_ln_s='cp -pR' > + as_ln_s='cp -p' > fi > rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file > rmdir conf$$.dir 2>/dev/null > @@ -13978,17 +13956,29 @@ > as_mkdir_p=false > fi > > +if test -x / >/dev/null 2>&1; then > + as_test_x='test -x' > +else > + if ls -dL / >/dev/null 2>&1; then > + as_ls_L_option=L > + else > + as_ls_L_option= > + fi > + as_test_x=' > + eval sh -c '\'' > + if test -d "$1"; then > + test -d "$1/."; > + else > + case $1 in #( > + -*)set "./$1";; > + esac; > + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( > + ???[sx]*):;;*)false;;esac;fi > + '\'' sh > + ' > +fi > +as_executable_p=$as_test_x > > -# as_fn_executable_p FILE > -# ----------------------- > -# Test if FILE is an executable regular file. > -as_fn_executable_p () > -{ > - test -f "$1" && test -x "$1" > -} # as_fn_executable_p > -as_test_x='test -x' > -as_executable_p=as_fn_executable_p > - > # Sed expression to map a string onto a valid CPP name. > as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" > > @@ -14009,7 +13999,7 @@ > # values after options handling. > ac_log=" > This file was extended by $as_me, which was > -generated by GNU Autoconf 2.69. Invocation command line was > +generated by GNU Autoconf 2.68. Invocation command line was > > CONFIG_FILES = $CONFIG_FILES > CONFIG_HEADERS = $CONFIG_HEADERS > @@ -14071,10 +14061,10 @@ > ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" > ac_cs_version="\\ > config.status > -configured by $0, generated by GNU Autoconf 2.69, > +configured by $0, generated by GNU Autoconf 2.68, > with options \\"\$ac_cs_config\\" > > -Copyright (C) 2012 Free Software Foundation, Inc. > +Copyright (C) 2010 Free Software Foundation, Inc. > This config.status script is free software; the Free Software Foundation > gives unlimited permission to copy, distribute and modify it." > > @@ -14163,7 +14153,7 @@ > _ACEOF > cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 > if \$ac_cs_recheck; then > - set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion > + set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion > shift > \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 > CONFIG_SHELL='$SHELL' > > Modified: ptlib/trunk/include/ptclib/pvidfile.h > =================================================================== > --- ptlib/trunk/include/ptclib/pvidfile.h 2013-02-18 08:06:31 UTC (rev 29141) > +++ ptlib/trunk/include/ptclib/pvidfile.h 2013-02-18 10:57:42 UTC (rev 29142) > @@ -128,42 +128,9 @@ > > PFACTORY_LOAD(PYUVFile); > > -#ifdef P_TINY_JPEG > +#endif > +#endif > > -#include "../tinyjpeg.h" > -#include "tinyjpeg-internal.h" > - > -/** > - * A file containing a JPEG image > - */ > - > -class PJPEGFile : public PVideoFile > -{ > - PCLASSINFO(PJPEGFile, PVideoFile); > - public: > - PJPEGFile(); > - > - virtual PBoolean Open( > - const PFilePath & name, // Name of file to open. > - PFile::OpenMode mode = PFile::ReadWrite, // Mode in which to open the file. > - PFile::OpenOptions opts = PFile::ModeDefault // <code>OpenOptions</code> enum# for open operation. > - ); > - > - virtual PBoolean WriteFrame(const void * frame); > - virtual PBoolean ReadFrame(void * frame); > - > - protected: > - jdec_private * m_jdec; > - unsigned char * m_fileData; > -}; > - > -PFACTORY_LOAD(PJPEGFile); > - > -#endif // P_TINY_JPEG > - > -#endif // P_VIDFILE > -#endif // P_VIDEO > - > #endif // PTLIB_PVIDFILE_H > > > > Modified: ptlib/trunk/include/ptlib/critsec.h > =================================================================== > --- ptlib/trunk/include/ptlib/critsec.h 2013-02-18 08:06:31 UTC (rev 29141) > +++ ptlib/trunk/include/ptlib/critsec.h 2013-02-18 10:57:42 UTC (rev 29142) > @@ -310,7 +310,7 @@ > __inline PAtomicInteger::IntegerType PAtomicInteger::operator++(int) { return EXCHANGE_AND_ADD(&m_value, 1); } > __inline PAtomicInteger::IntegerType PAtomicInteger::operator--() { return EXCHANGE_AND_ADD(&m_value, -1)-1; } > __inline PAtomicInteger::IntegerType PAtomicInteger::operator--(int) { return EXCHANGE_AND_ADD(&m_value, -1); } > -__inline bool PAtomicBoolean::TestAndSet(bool value) { IntegerType previous = EXCHANGE_AND_ADD(&m_value, value?1:-1); m_value = value?1:0; return previous > 0; } > +__inline bool PAtomicBoolean::TestAndSet(bool value) { IntegerType previous = value ? __sync_fetch_and_or(&m_value, 1) : __sync_fetch_and_and(&m_value, 0); return previous != 0; } > #else > __inline PAtomicBase::PAtomicBase(IntegerType value) : m_value(value) { pthread_mutex_init(&m_mutex, NULL); } > __inline PAtomicBase::~PAtomicBase() { pthread_mutex_destroy(&m_mutex); } > > Modified: ptlib/trunk/samples/javascript/js_test.cxx > =================================================================== > --- ptlib/trunk/samples/javascript/js_test.cxx 2013-02-18 08:06:31 UTC (rev 29141) > +++ ptlib/trunk/samples/javascript/js_test.cxx 2013-02-18 10:57:42 UTC (rev 29142) > @@ -106,7 +106,8 @@ > << "myNumber = " << jscript.GetNumber("myNumber") << endl > << "myBool = " << jscript.GetBoolean("myBool") << endl > << "myObject.pi = " << jscript.GetNumber("myObject.pi") << endl > - << "myObject.subObject.e = " << jscript.GetNumber("myObject.subObject.e") << endl; > + << "myObject.subObject.e = " << jscript.GetNumber("myObject.subObject.e") << endl > + << "myArray[0].element = " << jscript.GetNumber("myArray[0].element") << endl > ; > } > > > Modified: ptlib/trunk/src/ptclib/jscript.cxx > =================================================================== > --- ptlib/trunk/src/ptclib/jscript.cxx 2013-02-18 08:06:31 UTC (rev 29141) > +++ ptlib/trunk/src/ptclib/jscript.cxx 2013-02-18 10:57:42 UTC (rev 29142) > @@ -142,22 +142,60 @@ > PTRACE(5, "V8\tParseKey:node '" << name << " is too short"); > return v8::Handle<v8::Object>(); > } > + PINDEX i = 0; > + while (i < tokens.GetSize()) { > + PString element = tokens[i]; > +PTRACE(5, " Parsing element '" << element << "'"); > + PINDEX start = element.Find('['); > + if (start == P_MAX_INDEX) > + ++i; > + else { > + PINDEX end = element.Find(']', start+1); > + if (end != P_MAX_INDEX) { > + tokens[i] = element(0, start-1); > + ++i; > + tokens.InsertAt(i, new PString(element(start, end-1))); > + if (end < element.GetLength()-1) { > +PTRACE(5, " Split '" << element << "' into '" << element(0, start-1) << "','" << element(start,end-1) << "','" << element(end+1, P_MAX_INDEX) << "'"); > + i++; > + tokens.InsertAt(i, new PString(element(end+1, P_MAX_INDEX))); > + } > + else { > +PTRACE(5, " Split '" << element << "' into '" << element(0, start-1) << "','" << element(start,end-1) << "'"); > + } > + } > + ++i; > + } > + } > > v8::Local<v8::Value> value = m_context->Global(); > v8::Local<v8::Object> object; > > PString soFar; > - PINDEX i = 0; > + i = 0; > for (;;) { > - if (value->IsNull() || !value->IsObject()) { > - PTRACE(5, "V8\tParseKey:node '" << soFar << " is not an object"); > + if (value->IsNull()) { > + PTRACE(5, "V8\tParseKey:node '" << soFar << " not found"); > return v8::Handle<v8::Object>(); > } > - object = value->ToObject(); > if (i >= (tokens.GetSize()-1)) > break; > + if (value->IsObject() || value->IsArray()) { > + object = value->ToObject(); > + if (tokens[i][0] == '[') { > + value = object->Get(tokens[i].Mid(1).AsInteger()); > + PTRACE(5, "V8\tParseKey: array index = " << tokens[i]); > + } > + else { > + value = object->Get(v8::String::New((const char *)tokens[i])); > + PTRACE(5, "V8\tParseKey: object member = " << tokens[i]); > + } > + } > + else { > + PTRACE(5, "V8\tParseKey:node '" << soFar << "' is not a composite"); > + return v8::Handle<v8::Object>(); > + } > //cerr << " Getting node element " << i << " " << tokens[i] << endl; > - value = object->Get(v8::String::New((const char *)tokens[i])); > if (!soFar.IsEmpty()) > soFar += "."; > soFar += tokens[i]; > > Modified: ptlib/trunk/src/ptclib/pvidfile.cxx > =================================================================== > --- ptlib/trunk/src/ptclib/pvidfile.cxx 2013-02-18 08:06:31 UTC (rev 29141) > +++ ptlib/trunk/src/ptclib/pvidfile.cxx 2013-02-18 10:57:42 UTC (rev 29142) > @@ -210,102 +210,5 @@ > } > > > -/////////////////////////////////////////////////////////////////////////////// > - > -#ifdef P_TINY_JPEG > - > -#include "tinyjpeg.h" > - > -PFACTORY_CREATE(PFactory<PVideoFile>, PJPEGFile, "jpg", false); > -static PFactory<PVideoFile>::Worker<PJPEGFile> jpegFileFactory("jpeg"); > - > - > -PJPEGFile::PJPEGFile() > -{ > - if (m_jpdec != NULL) > - tinyjpeg_free(m_jpdec); > - if (m_fileData != NULL) > - delete[] m_fileData; > -} > - > -PJPEGFile::PJPEGFile() > -{ > - m_jpdec = NULL; > - m_fileData = NULL; > -} > - > - > -PBoolean PJPEGFile::Open(const PFilePath & name, PFile::OpenMode mode, PFile::OpenOptions opts) > -{ > - if (opts != PFile::ReadOnly) > - return false; > - > - if (!PVideoFile::Open(name, mode, opts)) > - return false; > - > - // init tinyjpeg > - m_jdec = tinyjpeg_init(); > - if (m_jdec == NULL) { > - PTRACE(1, "PJPEGFile", "Not enough memory to initialize JPEG decoder"); > - return false; > - } > - > - // load the file data > - off_t fileSize = m_file.GetLength(); > - m_fileData = new unsigned char[fileSize]; > - if (m_fileData == NULL) { > - PTRACE(1, "PJPEGFile", "Not enough memory to load JPEG image"); > - return false; > - } > - > - if (!m_file.ReadBlock(m_fileData, fileSize)) > - return false; > - > - // parse jpeg header > - if (tinyjpeg_parse_header(m_jdec, m_fileData, fileSize) < 0) { > - PTRACE(1, "PJPEGFile", "Failed to parse JPEG header: " << tinyjpeg_get_errorstring(jdec)); > - return false; > - } > - > - // get dimensions > - uint w,h; > - tinyjpeg_get_size(m_jdec, &w, &h); > - > - // decode pixel data > - if (tinyjpeg_decode(m_jdec, TINYJPEG_FMT_RGB24) < 0) { > - PTRACE(1, "PJPEGFile", "Failed to parse JPEG header: " << tinyjpeg_get_errorstring(jdec)); > - return false; > - } > - > - // copy the pixel data > - ubyte*[3] components; > - tinyjpeg_get_components(jdec, components.ptr); > - ubyte[] pixels = components[0][0..w*h*3].dup; > - if (m_y4mMode) { > - int ch; > - do { > - if ((ch = m_file.ReadChar()) < 0) > - return false; > - } > - while (ch != '\n'); > - m_headerOffset = m_file.GetPosition(); > - } > - > - return true; > -} > - > - > -PBoolean PJPEGFile::WriteFrame(const void * frame) > -{ > - return false; > -} > - > - > -PBoolean PJPEGFile::ReadFrame(void * frame) > -{ > - return false; > -} > - > -#endif // P_TINY_JPEG > #endif // P_VIDFILE > #endif // P_VIDEO > > This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. > > > ------------------------------------------------------------------------------ > The Go Parallel Website, sponsored by Intel - in partnership with Geeknet, > is your hub for all things parallel software development, from weekly thought > leadership blogs to news, videos, case studies, tutorials, tech docs, > whitepapers, evaluation guides, and opinion stories. Check out the most > recent posts - join the conversation now. http://goparallel.sourceforge.net/ > _______________________________________________ > Opalvoip-svn mailing list > Opa...@li... > https://lists.sourceforge.net/lists/listinfo/opalvoip-svn |