Changeset 4157


Ignore:
Timestamp:
Jun 6, 2012 9:37:25 AM (12 years ago)
Author:
nanang
Message:

Close #1529:

  • replaced obsoleted SDL constants SDL_*_OVERLAY
  • updated build config/scripts
Location:
pjproject/trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • pjproject/trunk/aconfigure

    r4149 r4157  
    11#! /bin/sh 
    22# Guess values for system-dependent variables and create Makefiles. 
    3 # Generated by GNU Autoconf 2.69 for pjproject 2.x. 
     3# Generated by GNU Autoconf 2.67 for pjproject 2.x. 
    44# 
    55# 
    6 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. 
     6# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 
     7# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software 
     8# Foundation, Inc. 
    79# 
    810# 
    … …  
    8890 
    8991# Find who we are.  Look in the path if we contain no directory separator. 
    90 as_myself= 
    9192case $0 in #(( 
    9293  *[\\/]* ) as_myself=$0 ;; 
    … …  
    133134(unset CDPATH) >/dev/null 2>&1 && unset CDPATH 
    134135 
    135 # Use a proper internal environment variable to ensure we don't fall 
    136   # into an infinite loop, continuously re-executing ourselves. 
    137   if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then 
    138     _as_can_reexec=no; export _as_can_reexec; 
    139     # We cannot yet assume a decent shell, so we have to provide a 
    140 # neutralization value for shells without unset; and this also 
    141 # works around shells that cannot unset nonexistent variables. 
    142 # Preserve -v and -x to the replacement shell. 
    143 BASH_ENV=/dev/null 
    144 ENV=/dev/null 
    145 (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV 
    146 case $- in # (((( 
    147   *v*x* | *x*v* ) as_opts=-vx ;; 
    148   *v* ) as_opts=-v ;; 
    149   *x* ) as_opts=-x ;; 
    150   * ) as_opts= ;; 
    151 esac 
    152 exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} 
    153 # Admittedly, this is quite paranoid, since all the known shells bail 
    154 # out after a failed `exec'. 
    155 $as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 
    156 as_fn_exit 255 
    157   fi 
    158   # We don't want this to propagate to other subprocesses. 
    159           { _as_can_reexec=; unset _as_can_reexec;} 
    160136if test "x$CONFIG_SHELL" = x; then 
    161137  as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : 
    … …  
    191167  exitcode=1; echo positional parameters were not saved. 
    192168fi 
    193 test x\$exitcode = x0 || exit 1 
    194 test -x / || exit 1" 
     169test x\$exitcode = x0 || exit 1" 
    195170  as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO 
    196171  as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO 
    … …  
    237212 
    238213      if test "x$CONFIG_SHELL" != x; then : 
    239   export CONFIG_SHELL 
    240              # We cannot yet assume a decent shell, so we have to provide a 
    241 # neutralization value for shells without unset; and this also 
    242 # works around shells that cannot unset nonexistent variables. 
    243 # Preserve -v and -x to the replacement shell. 
    244 BASH_ENV=/dev/null 
    245 ENV=/dev/null 
    246 (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV 
    247 case $- in # (((( 
    248   *v*x* | *x*v* ) as_opts=-vx ;; 
    249   *v* ) as_opts=-v ;; 
    250   *x* ) as_opts=-x ;; 
    251   * ) as_opts= ;; 
    252 esac 
    253 exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} 
    254 # Admittedly, this is quite paranoid, since all the known shells bail 
    255 # out after a failed `exec'. 
    256 $as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 
    257 exit 255 
     214  # We cannot yet assume a decent shell, so we have to provide a 
     215        # neutralization value for shells without unset; and this also 
     216        # works around shells that cannot unset nonexistent variables. 
     217        BASH_ENV=/dev/null 
     218        ENV=/dev/null 
     219        (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV 
     220        export CONFIG_SHELL 
     221        exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} 
    258222fi 
    259223 
    … …  
    357321 
    358322} # as_fn_mkdir_p 
    359  
    360 # as_fn_executable_p FILE 
    361 # ----------------------- 
    362 # Test if FILE is an executable regular file. 
    363 as_fn_executable_p () 
    364 { 
    365   test -f "$1" && test -x "$1" 
    366 } # as_fn_executable_p 
    367323# as_fn_append VAR VALUE 
    368324# ---------------------- 
    … …  
    486442    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } 
    487443 
    488   # If we had to re-execute with $CONFIG_SHELL, we're ensured to have 
    489   # already done that, so ensure we don't try to do so again and fall 
    490   # in an infinite loop.  This has already happened in practice. 
    491   _as_can_reexec=no; export _as_can_reexec 
    492444  # Don't try to exec as it changes $[0], causing all sort of problems 
    493445  # (the dirname of $[0] is not the place where we might find the 
    … …  
    524476    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. 
    525477    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. 
    526     # In both cases, we have to default to `cp -pR'. 
     478    # In both cases, we have to default to `cp -p'. 
    527479    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || 
    528       as_ln_s='cp -pR' 
     480      as_ln_s='cp -p' 
    529481  elif ln conf$$.file conf$$ 2>/dev/null; then 
    530482    as_ln_s=ln 
    531483  else 
    532     as_ln_s='cp -pR' 
     484    as_ln_s='cp -p' 
    533485  fi 
    534486else 
    535   as_ln_s='cp -pR' 
     487  as_ln_s='cp -p' 
    536488fi 
    537489rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file 
    … …  
    545497fi 
    546498 
    547 as_test_x='test -x' 
    548 as_executable_p=as_fn_executable_p 
     499if test -x / >/dev/null 2>&1; then 
     500  as_test_x='test -x' 
     501else 
     502  if ls -dL / >/dev/null 2>&1; then 
     503    as_ls_L_option=L 
     504  else 
     505    as_ls_L_option= 
     506  fi 
     507  as_test_x=' 
     508    eval sh -c '\'' 
     509      if test -d "$1"; then 
     510        test -d "$1/."; 
     511      else 
     512        case $1 in #( 
     513        -*)set "./$1";; 
     514        esac; 
     515        case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( 
     516        ???[sx]*):;;*)false;;esac;fi 
     517    '\'' sh 
     518  ' 
     519fi 
     520as_executable_p=$as_test_x 
    549521 
    550522# Sed expression to map a string onto a valid CPP name. 
    … …  
    640612ac_sdl_ldflags 
    641613ac_sdl_cflags 
     614SDL_CONFIG 
    642615ac_resample_dll 
    643616ac_no_ilbc_codec 
    … …  
    11961169    expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && 
    11971170      $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 
    1198     : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}" 
     1171    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} 
    11991172    ;; 
    12001173 
    … …  
    12471220  if test "x$build_alias" = x; then 
    12481221    cross_compiling=maybe 
     1222    $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. 
     1223    If a cross compiler is detected then cross compile mode will be used" >&2 
    12491224  elif test "x$build_alias" != "x$host_alias"; then 
    12501225    cross_compiling=yes 
    … …  
    15471522  cat <<\_ACEOF 
    15481523pjproject configure 2.x 
    1549 generated by GNU Autoconf 2.69 
    1550  
    1551 Copyright (C) 2012 Free Software Foundation, Inc. 
     1524generated by GNU Autoconf 2.67 
     1525 
     1526Copyright (C) 2010 Free Software Foundation, Inc. 
    15521527This configure script is free software; the Free Software Foundation 
    15531528gives unlimited permission to copy, distribute and modify it. 
    … …  
    15931568        ac_retval=1 
    15941569fi 
    1595   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno 
     1570  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 
    15961571  as_fn_set_status $ac_retval 
    15971572 
    … …  
    16311606        ac_retval=1 
    16321607fi 
    1633   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno 
     1608  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 
    16341609  as_fn_set_status $ac_retval 
    16351610 
    … …  
    16631638       } && test -s conftest$ac_exeext && { 
    16641639         test "$cross_compiling" = yes || 
    1665          test -x conftest$ac_exeext 
     1640         $as_test_x conftest$ac_exeext 
    16661641       }; then : 
    16671642  ac_retval=0 
    … …  
    16771652  # left behind by Apple's compiler.  We do this before executing the actions. 
    16781653  rm -rf conftest.dSYM conftest_ipa8_conftest.oo 
    1679   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno 
     1654  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 
    16801655  as_fn_set_status $ac_retval 
    16811656 
    … …  
    17191694fi 
    17201695  rm -rf conftest.dSYM conftest_ipa8_conftest.oo 
    1721   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno 
     1696  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 
    17221697  as_fn_set_status $ac_retval 
    17231698 
    … …  
    17561731    ac_retval=1 
    17571732fi 
    1758   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno 
     1733  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 
    17591734  as_fn_set_status $ac_retval 
    17601735 
    … …  
    17701745  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 
    17711746$as_echo_n "checking for $2... " >&6; } 
    1772 if eval \${$3+:} false; then : 
     1747if eval "test \"\${$3+set}\"" = set; then : 
    17731748  $as_echo_n "(cached) " >&6 
    17741749else 
    … …  
    17881763               { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 
    17891764$as_echo "$ac_res" >&6; } 
    1790   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno 
     1765  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 
    17911766 
    17921767} # ac_fn_c_check_header_compile 
    … …  
    18001775{ 
    18011776  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack 
    1802   if eval \${$3+:} false; then : 
     1777  if eval "test \"\${$3+set}\"" = set; then : 
    18031778  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 
    18041779$as_echo_n "checking for $2... " >&6; } 
    1805 if eval \${$3+:} false; then : 
     1780if eval "test \"\${$3+set}\"" = set; then : 
    18061781  $as_echo_n "(cached) " >&6 
    18071782fi 
    … …  
    18661841  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 
    18671842$as_echo_n "checking for $2... " >&6; } 
    1868 if eval \${$3+:} false; then : 
     1843if eval "test \"\${$3+set}\"" = set; then : 
    18691844  $as_echo_n "(cached) " >&6 
    18701845else 
    … …  
    18751850$as_echo "$ac_res" >&6; } 
    18761851fi 
    1877   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno 
     1852  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 
    18781853 
    18791854} # ac_fn_c_check_header_mongrel 
    … …  
    18871862  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 
    18881863$as_echo_n "checking for $2... " >&6; } 
    1889 if eval \${$3+:} false; then : 
     1864if eval "test \"\${$3+set}\"" = set; then : 
    18901865  $as_echo_n "(cached) " >&6 
    18911866else 
    … …  
    19421917               { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 
    19431918$as_echo "$ac_res" >&6; } 
    1944   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno 
     1919  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 
    19451920 
    19461921} # ac_fn_c_check_func 
    … …  
    19501925 
    19511926It was created by pjproject $as_me 2.x, which was 
    1952 generated by GNU Autoconf 2.69.  Invocation command line was 
     1927generated by GNU Autoconf 2.67.  Invocation command line was 
    19531928 
    19541929  $ $0 $@ 
    … …  
    22082183$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 
    22092184as_fn_error $? "failed to load site script $ac_site_file 
    2210 See \`config.log' for more details" "$LINENO" 5; } 
     2185See \`config.log' for more details" "$LINENO" 5 ; } 
    22112186  fi 
    22122187done 
    … …  
    23352310{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 
    23362311$as_echo_n "checking build system type... " >&6; } 
    2337 if ${ac_cv_build+:} false; then : 
     2312if test "${ac_cv_build+set}" = set; then : 
    23382313  $as_echo_n "(cached) " >&6 
    23392314else 
    … …  
    23512326case $ac_cv_build in 
    23522327*-*-*) ;; 
    2353 *) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; 
     2328*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;; 
    23542329esac 
    23552330build=$ac_cv_build 
    … …  
    23692344{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 
    23702345$as_echo_n "checking host system type... " >&6; } 
    2371 if ${ac_cv_host+:} false; then : 
     2346if test "${ac_cv_host+set}" = set; then : 
    23722347  $as_echo_n "(cached) " >&6 
    23732348else 
    … …  
    23842359case $ac_cv_host in 
    23852360*-*-*) ;; 
    2386 *) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; 
     2361*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;; 
    23872362esac 
    23882363host=$ac_cv_host 
    … …  
    24022377{ $as_echo "$as_me:${as_lineno-$LINENO}: checking target system type" >&5 
    24032378$as_echo_n "checking target system type... " >&6; } 
    2404 if ${ac_cv_target+:} false; then : 
     2379if test "${ac_cv_target+set}" = set; then : 
    24052380  $as_echo_n "(cached) " >&6 
    24062381else 
    … …  
    24172392case $ac_cv_target in 
    24182393*-*-*) ;; 
    2419 *) as_fn_error $? "invalid value of canonical target" "$LINENO" 5;; 
     2394*) as_fn_error $? "invalid value of canonical target" "$LINENO" 5 ;; 
    24202395esac 
    24212396target=$ac_cv_target 
    … …  
    24632438{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 
    24642439$as_echo_n "checking for $ac_word... " >&6; } 
    2465 if ${ac_cv_prog_CC+:} false; then : 
     2440if test "${ac_cv_prog_CC+set}" = set; then : 
    24662441  $as_echo_n "(cached) " >&6 
    24672442else 
    … …  
    24752450  test -z "$as_dir" && as_dir=. 
    24762451    for ac_exec_ext in '' $ac_executable_extensions; do 
    2477   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 
     2452  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 
    24782453    ac_cv_prog_CC="${ac_tool_prefix}gcc" 
    24792454    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 
    … …  
    25032478{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 
    25042479$as_echo_n "checking for $ac_word... " >&6; } 
    2505 if ${ac_cv_prog_ac_ct_CC+:} false; then : 
     2480if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : 
    25062481  $as_echo_n "(cached) " >&6 
    25072482else 
    … …  
    25152490  test -z "$as_dir" && as_dir=. 
    25162491    for ac_exec_ext in '' $ac_executable_extensions; do 
    2517   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 
     2492  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 
    25182493    ac_cv_prog_ac_ct_CC="gcc" 
    25192494    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 
    … …  
    25562531{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 
    25572532$as_echo_n "checking for $ac_word... " >&6; } 
    2558 if ${ac_cv_prog_CC+:} false; then : 
     2533if test "${ac_cv_prog_CC+set}" = set; then : 
    25592534  $as_echo_n "(cached) " >&6 
    25602535else 
    … …  
    25682543  test -z "$as_dir" && as_dir=. 
    25692544    for ac_exec_ext in '' $ac_executable_extensions; do 
    2570   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 
     2545  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 
    25712546    ac_cv_prog_CC="${ac_tool_prefix}cc" 
    25722547    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 
    … …  
    25962571{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 
    25972572$as_echo_n "checking for $ac_word... " >&6; } 
    2598 if ${ac_cv_prog_CC+:} false; then : 
     2573if test "${ac_cv_prog_CC+set}" = set; then : 
    25992574  $as_echo_n "(cached) " >&6 
    26002575else 
    … …  
    26092584  test -z "$as_dir" && as_dir=. 
    26102585    for ac_exec_ext in '' $ac_executable_extensions; do 
    2611   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 
     2586  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 
    26122587    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then 
    26132588       ac_prog_rejected=yes 
    … …  
    26552630{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 
    26562631$as_echo_n "checking for $ac_word... " >&6; } 
    2657 if ${ac_cv_prog_CC+:} false; then : 
     2632if test "${ac_cv_prog_CC+set}" = set; then : 
    26582633  $as_echo_n "(cached) " >&6 
    26592634else 
    … …  
    26672642  test -z "$as_dir" && as_dir=. 
    26682643    for ac_exec_ext in '' $ac_executable_extensions; do 
    2669   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 
     2644  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 
    26702645    ac_cv_prog_CC="$ac_tool_prefix$ac_prog" 
    26712646    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 
    … …  
    26992674{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 
    27002675$as_echo_n "checking for $ac_word... " >&6; } 
    2701 if ${ac_cv_prog_ac_ct_CC+:} false; then : 
     2676if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : 
    27022677  $as_echo_n "(cached) " >&6 
    27032678else 
    … …  
    27112686  test -z "$as_dir" && as_dir=. 
    27122687    for ac_exec_ext in '' $ac_executable_extensions; do 
    2713   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 
     2688  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 
    27142689    ac_cv_prog_ac_ct_CC="$ac_prog" 
    27152690    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 
    … …  
    27542729$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 
    27552730as_fn_error $? "no acceptable C compiler found in \$PATH 
    2756 See \`config.log' for more details" "$LINENO" 5; } 
     2731See \`config.log' for more details" "$LINENO" 5 ; } 
    27572732 
    27582733# Provide some information about the compiler. 
    … …  
    28692844$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 
    28702845as_fn_error 77 "C compiler cannot create executables 
    2871 See \`config.log' for more details" "$LINENO" 5; } 
     2846See \`config.log' for more details" "$LINENO" 5 ; } 
    28722847else 
    28732848  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 
    … …  
    29122887$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 
    29132888as_fn_error $? "cannot compute suffix of executables: cannot compile and link 
    2914 See \`config.log' for more details" "$LINENO" 5; } 
     2889See \`config.log' for more details" "$LINENO" 5 ; } 
    29152890fi 
    29162891rm -f conftest conftest$ac_cv_exeext 
    … …  
    29712946as_fn_error $? "cannot run C compiled programs. 
    29722947If you meant to cross compile, use \`--host'. 
    2973 See \`config.log' for more details" "$LINENO" 5; } 
     2948See \`config.log' for more details" "$LINENO" 5 ; } 
    29742949    fi 
    29752950  fi 
    … …  
    29822957{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 
    29832958$as_echo_n "checking for suffix of object files... " >&6; } 
    2984 if ${ac_cv_objext+:} false; then : 
     2959if test "${ac_cv_objext+set}" = set; then : 
    29852960  $as_echo_n "(cached) " >&6 
    29862961else 
    … …  
    30232998$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 
    30242999as_fn_error $? "cannot compute suffix of object files: cannot compile 
    3025 See \`config.log' for more details" "$LINENO" 5; } 
     3000See \`config.log' for more details" "$LINENO" 5 ; } 
    30263001fi 
    30273002rm -f conftest.$ac_cv_objext conftest.$ac_ext 
    … …  
    30333008{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 
    30343009$as_echo_n "checking whether we are using the GNU C compiler... " >&6; } 
    3035 if ${ac_cv_c_compiler_gnu+:} false; then : 
     3010if test "${ac_cv_c_compiler_gnu+set}" = set; then : 
    30363011  $as_echo_n "(cached) " >&6 
    30373012else 
    … …  
    30703045{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 
    30713046$as_echo_n "checking whether $CC accepts -g... " >&6; } 
    3072 if ${ac_cv_prog_cc_g+:} false; then : 
     3047if test "${ac_cv_prog_cc_g+set}" = set; then : 
    30733048  $as_echo_n "(cached) " >&6 
    30743049else 
    … …  
    31483123{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 
    31493124$as_echo_n "checking for $CC option to accept ISO C89... " >&6; } 
    3150 if ${ac_cv_prog_cc_c89+:} false; then : 
     3125if test "${ac_cv_prog_cc_c89+set}" = set; then : 
    31513126  $as_echo_n "(cached) " >&6 
    31523127else 
    … …  
    31573132#include <stdarg.h> 
    31583133#include <stdio.h> 
    3159 struct stat; 
     3134#include <sys/types.h> 
     3135#include <sys/stat.h> 
    31603136/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */ 
    31613137struct buf { int x; }; 
    … …  
    32583234{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 
    32593235$as_echo_n "checking for $ac_word... " >&6; } 
    3260 if ${ac_cv_prog_CXX+:} false; then : 
     3236if test "${ac_cv_prog_CXX+set}" = set; then : 
    32613237  $as_echo_n "(cached) " >&6 
    32623238else 
    … …  
    32703246  test -z "$as_dir" && as_dir=. 
    32713247    for ac_exec_ext in '' $ac_executable_extensions; do 
    3272   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 
     3248  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 
    32733249    ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" 
    32743250    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 
    … …  
    33023278{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 
    33033279$as_echo_n "checking for $ac_word... " >&6; } 
    3304 if ${ac_cv_prog_ac_ct_CXX+:} false; then : 
     3280if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then : 
    33053281  $as_echo_n "(cached) " >&6 
    33063282else 
    … …  
    33143290  test -z "$as_dir" && as_dir=. 
    33153291    for ac_exec_ext in '' $ac_executable_extensions; do 
    3316   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 
     3292  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 
    33173293    ac_cv_prog_ac_ct_CXX="$ac_prog" 
    33183294    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 
    … …  
    33803356{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5 
    33813357$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; } 
    3382 if ${ac_cv_cxx_compiler_gnu+:} false; then : 
     3358if test "${ac_cv_cxx_compiler_gnu+set}" = set; then : 
    33833359  $as_echo_n "(cached) " >&6 
    33843360else 
    … …  
    34173393{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5 
    34183394$as_echo_n "checking whether $CXX accepts -g... " >&6; } 
    3419 if ${ac_cv_prog_cxx_g+:} false; then : 
     3395if test "${ac_cv_prog_cxx_g+set}" = set; then : 
    34203396  $as_echo_n "(cached) " >&6 
    34213397else 
    … …  
    35773553{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lpthread" >&5 
    35783554$as_echo_n "checking for pthread_create in -lpthread... " >&6; } 
    3579 if ${ac_cv_lib_pthread_pthread_create+:} false; then : 
     3555if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then : 
    35803556  $as_echo_n "(cached) " >&6 
    35813557else 
    … …  
    36113587{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_create" >&5 
    36123588$as_echo "$ac_cv_lib_pthread_pthread_create" >&6; } 
    3613 if test "x$ac_cv_lib_pthread_pthread_create" = xyes; then : 
     3589if test "x$ac_cv_lib_pthread_pthread_create" = x""yes; then : 
    36143590  cat >>confdefs.h <<_ACEOF 
    36153591#define HAVE_LIBPTHREAD 1 
    … …  
    36223598{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for puts in -lwsock32" >&5 
    36233599$as_echo_n "checking for puts in -lwsock32... " >&6; } 
    3624 if ${ac_cv_lib_wsock32_puts+:} false; then : 
     3600if test "${ac_cv_lib_wsock32_puts+set}" = set; then : 
    36253601  $as_echo_n "(cached) " >&6 
    36263602else 
    … …  
    36563632{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_wsock32_puts" >&5 
    36573633$as_echo "$ac_cv_lib_wsock32_puts" >&6; } 
    3658 if test "x$ac_cv_lib_wsock32_puts" = xyes; then : 
     3634if test "x$ac_cv_lib_wsock32_puts" = x""yes; then : 
    36593635  cat >>confdefs.h <<_ACEOF 
    36603636#define HAVE_LIBWSOCK32 1 
    … …  
    36673643{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for puts in -lws2_32" >&5 
    36683644$as_echo_n "checking for puts in -lws2_32... " >&6; } 
    3669 if ${ac_cv_lib_ws2_32_puts+:} false; then : 
     3645if test "${ac_cv_lib_ws2_32_puts+set}" = set; then : 
    36703646  $as_echo_n "(cached) " >&6 
    36713647else 
    … …  
    37013677{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ws2_32_puts" >&5 
    37023678$as_echo "$ac_cv_lib_ws2_32_puts" >&6; } 
    3703 if test "x$ac_cv_lib_ws2_32_puts" = xyes; then : 
     3679if test "x$ac_cv_lib_ws2_32_puts" = x""yes; then : 
    37043680  cat >>confdefs.h <<_ACEOF 
    37053681#define HAVE_LIBWS2_32 1 
    … …  
    37123688{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for puts in -lole32" >&5 
    37133689$as_echo_n "checking for puts in -lole32... " >&6; } 
    3714 if ${ac_cv_lib_ole32_puts+:} false; then : 
     3690if test "${ac_cv_lib_ole32_puts+set}" = set; then : 
    37153691  $as_echo_n "(cached) " >&6 
    37163692else 
    … …  
    37463722{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ole32_puts" >&5 
    37473723$as_echo "$ac_cv_lib_ole32_puts" >&6; } 
    3748 if test "x$ac_cv_lib_ole32_puts" = xyes; then : 
     3724if test "x$ac_cv_lib_ole32_puts" = x""yes; then : 
    37493725  cat >>confdefs.h <<_ACEOF 
    37503726#define HAVE_LIBOLE32 1 
    … …  
    37573733{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for puts in -lwinmm" >&5 
    37583734$as_echo_n "checking for puts in -lwinmm... " >&6; } 
    3759 if ${ac_cv_lib_winmm_puts+:} false; then : 
     3735if test "${ac_cv_lib_winmm_puts+set}" = set; then : 
    37603736  $as_echo_n "(cached) " >&6 
    37613737else 
    … …  
    37913767{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_winmm_puts" >&5 
    37923768$as_echo "$ac_cv_lib_winmm_puts" >&6; } 
    3793 if test "x$ac_cv_lib_winmm_puts" = xyes; then : 
     3769if test "x$ac_cv_lib_winmm_puts" = x""yes; then : 
    37943770  cat >>confdefs.h <<_ACEOF 
    37953771#define HAVE_LIBWINMM 1 
    … …  
    38023778{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for puts in -lsocket" >&5 
    38033779$as_echo_n "checking for puts in -lsocket... " >&6; } 
    3804 if ${ac_cv_lib_socket_puts+:} false; then : 
     3780if test "${ac_cv_lib_socket_puts+set}" = set; then : 
    38053781  $as_echo_n "(cached) " >&6 
    38063782else 
    … …  
    38363812{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_puts" >&5 
    38373813$as_echo "$ac_cv_lib_socket_puts" >&6; } 
    3838 if test "x$ac_cv_lib_socket_puts" = xyes; then : 
     3814if test "x$ac_cv_lib_socket_puts" = x""yes; then : 
    38393815  cat >>confdefs.h <<_ACEOF 
    38403816#define HAVE_LIBSOCKET 1 
    … …  
    38473823{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for puts in -lrt" >&5 
    38483824$as_echo_n "checking for puts in -lrt... " >&6; } 
    3849 if ${ac_cv_lib_rt_puts+:} false; then : 
     3825if test "${ac_cv_lib_rt_puts+set}" = set; then : 
    38503826  $as_echo_n "(cached) " >&6 
    38513827else 
    … …  
    38813857{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_puts" >&5 
    38823858$as_echo "$ac_cv_lib_rt_puts" >&6; } 
    3883 if test "x$ac_cv_lib_rt_puts" = xyes; then : 
     3859if test "x$ac_cv_lib_rt_puts" = x""yes; then : 
    38843860  cat >>confdefs.h <<_ACEOF 
    38853861#define HAVE_LIBRT 1 
    … …  
    38923868{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for puts in -lnsl" >&5 
    38933869$as_echo_n "checking for puts in -lnsl... " >&6; } 
    3894 if ${ac_cv_lib_nsl_puts+:} false; then : 
     3870if test "${ac_cv_lib_nsl_puts+set}" = set; then : 
    38953871  $as_echo_n "(cached) " >&6 
    38963872else 
    … …  
    39263902{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_puts" >&5 
    39273903$as_echo "$ac_cv_lib_nsl_puts" >&6; } 
    3928 if test "x$ac_cv_lib_nsl_puts" = xyes; then : 
     3904if test "x$ac_cv_lib_nsl_puts" = x""yes; then : 
    39293905  cat >>confdefs.h <<_ACEOF 
    39303906#define HAVE_LIBNSL 1 
    … …  
    39373913{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for uuid_generate in -luuid" >&5 
    39383914$as_echo_n "checking for uuid_generate in -luuid... " >&6; } 
    3939 if ${ac_cv_lib_uuid_uuid_generate+:} false; then : 
     3915if test "${ac_cv_lib_uuid_uuid_generate+set}" = set; then : 
    39403916  $as_echo_n "(cached) " >&6 
    39413917else 
    … …  
    39713947{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_uuid_uuid_generate" >&5 
    39723948$as_echo "$ac_cv_lib_uuid_uuid_generate" >&6; } 
    3973 if test "x$ac_cv_lib_uuid_uuid_generate" = xyes; then : 
     3949if test "x$ac_cv_lib_uuid_uuid_generate" = x""yes; then : 
    39743950  cat >>confdefs.h <<_ACEOF 
    39753951#define HAVE_LIBUUID 1 
    … …  
    39823958{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for uuid_generate in -luuid" >&5 
    39833959$as_echo_n "checking for uuid_generate in -luuid... " >&6; } 
    3984 if ${ac_cv_lib_uuid_uuid_generate+:} false; then : 
     3960if test "${ac_cv_lib_uuid_uuid_generate+set}" = set; then : 
    39853961  $as_echo_n "(cached) " >&6 
    39863962else 
    … …  
    40163992{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_uuid_uuid_generate" >&5 
    40173993$as_echo "$ac_cv_lib_uuid_uuid_generate" >&6; } 
    4018 if test "x$ac_cv_lib_uuid_uuid_generate" = xyes; then : 
     3994if test "x$ac_cv_lib_uuid_uuid_generate" = x""yes; then : 
    40193995  ac_has_uuid_lib=1 
    40203996fi 
    … …  
    40584034fi 
    40594035if test -z "$CPP"; then 
    4060   if ${ac_cv_prog_CPP+:} false; then : 
     4036  if test "${ac_cv_prog_CPP+set}" = set; then : 
    40614037  $as_echo_n "(cached) " >&6 
    40624038else 
    … …  
    41744150$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 
    41754151as_fn_error $? "C preprocessor \"$CPP\" fails sanity check 
    4176 See \`config.log' for more details" "$LINENO" 5; } 
     4152See \`config.log' for more details" "$LINENO" 5 ; } 
    41774153fi 
    41784154 
    … …  
    41864162{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 
    41874163$as_echo_n "checking for grep that handles long lines and -e... " >&6; } 
    4188 if ${ac_cv_path_GREP+:} false; then : 
     4164if test "${ac_cv_path_GREP+set}" = set; then : 
    41894165  $as_echo_n "(cached) " >&6 
    41904166else 
    … …  
    42004176    for ac_exec_ext in '' $ac_executable_extensions; do 
    42014177      ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" 
    4202       as_fn_executable_p "$ac_path_GREP" || continue 
     4178      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue 
    42034179# Check for GNU ac_path_GREP and select it if it is found. 
    42044180  # Check for GNU $ac_path_GREP 
    … …  
    42494225{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 
    42504226$as_echo_n "checking for egrep... " >&6; } 
    4251 if ${ac_cv_path_EGREP+:} false; then : 
     4227if test "${ac_cv_path_EGREP+set}" = set; then : 
    42524228  $as_echo_n "(cached) " >&6 
    42534229else 
    … …  
    42664242    for ac_exec_ext in '' $ac_executable_extensions; do 
    42674243      ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" 
    4268       as_fn_executable_p "$ac_path_EGREP" || continue 
     4244      { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue 
    42694245# Check for GNU ac_path_EGREP and select it if it is found. 
    42704246  # Check for GNU $ac_path_EGREP 
    … …  
    43164292{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 
    43174293$as_echo_n "checking for ANSI C header files... " >&6; } 
    4318 if ${ac_cv_header_stdc+:} false; then : 
     4294if test "${ac_cv_header_stdc+set}" = set; then : 
    43194295  $as_echo_n "(cached) " >&6 
    43204296else 
    … …  
    44454421 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5 
    44464422$as_echo_n "checking whether byte ordering is bigendian... " >&6; } 
    4447 if ${ac_cv_c_bigendian+:} false; then : 
     4423if test "${ac_cv_c_bigendian+set}" = set; then : 
    44484424  $as_echo_n "(cached) " >&6 
    44494425else 
    … …  
    46644640   *) 
    46654641     as_fn_error $? "unknown endianness 
    4666  presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;; 
     4642 presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5  ;; 
    46674643 esac 
    46684644 
    … …  
    47224698                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fmod in -lm" >&5 
    47234699$as_echo_n "checking for fmod in -lm... " >&6; } 
    4724 if ${ac_cv_lib_m_fmod+:} false; then : 
     4700if test "${ac_cv_lib_m_fmod+set}" = set; then : 
    47254701  $as_echo_n "(cached) " >&6 
    47264702else 
    … …  
    47564732{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_fmod" >&5 
    47574733$as_echo "$ac_cv_lib_m_fmod" >&6; } 
    4758 if test "x$ac_cv_lib_m_fmod" = xyes; then : 
     4734if test "x$ac_cv_lib_m_fmod" = x""yes; then : 
    47594735  cat >>confdefs.h <<_ACEOF 
    47604736#define HAVE_LIBM 1 
    … …  
    47714747 
    47724748ac_fn_c_check_header_mongrel "$LINENO" "arpa/inet.h" "ac_cv_header_arpa_inet_h" "$ac_includes_default" 
    4773 if test "x$ac_cv_header_arpa_inet_h" = xyes; then : 
     4749if test "x$ac_cv_header_arpa_inet_h" = x""yes; then : 
    47744750  $as_echo "#define PJ_HAS_ARPA_INET_H 1" >>confdefs.h 
    47754751 
    … …  
    47784754 
    47794755ac_fn_c_check_header_mongrel "$LINENO" "assert.h" "ac_cv_header_assert_h" "$ac_includes_default" 
    4780 if test "x$ac_cv_header_assert_h" = xyes; then : 
     4756if test "x$ac_cv_header_assert_h" = x""yes; then : 
    47814757  $as_echo "#define PJ_HAS_ASSERT_H 1" >>confdefs.h 
    47824758 
    … …  
    47854761 
    47864762ac_fn_c_check_header_mongrel "$LINENO" "ctype.h" "ac_cv_header_ctype_h" "$ac_includes_default" 
    4787 if test "x$ac_cv_header_ctype_h" = xyes; then : 
     4763if test "x$ac_cv_header_ctype_h" = x""yes; then : 
    47884764  $as_echo "#define PJ_HAS_CTYPE_H 1" >>confdefs.h 
    47894765 
    … …  
    47994775    *) 
    48004776        ac_fn_c_check_header_mongrel "$LINENO" "errno.h" "ac_cv_header_errno_h" "$ac_includes_default" 
    4801 if test "x$ac_cv_header_errno_h" = xyes; then : 
     4777if test "x$ac_cv_header_errno_h" = x""yes; then : 
    48024778  $as_echo "#define PJ_HAS_ERRNO_H 1" >>confdefs.h 
    48034779 
    … …  
    48094785 
    48104786ac_fn_c_check_header_mongrel "$LINENO" "fcntl.h" "ac_cv_header_fcntl_h" "$ac_includes_default" 
    4811 if test "x$ac_cv_header_fcntl_h" = xyes; then : 
     4787if test "x$ac_cv_header_fcntl_h" = x""yes; then : 
    48124788  $as_echo "#define PJ_HAS_FCNTL_H 1" >>confdefs.h 
    48134789 
    … …  
    48164792 
    48174793ac_fn_c_check_header_mongrel "$LINENO" "linux/socket.h" "ac_cv_header_linux_socket_h" "$ac_includes_default" 
    4818 if test "x$ac_cv_header_linux_socket_h" = xyes; then : 
     4794if test "x$ac_cv_header_linux_socket_h" = x""yes; then : 
    48194795  $as_echo "#define PJ_HAS_LINUX_SOCKET_H 1" >>confdefs.h 
    48204796 
    … …  
    48234799 
    48244800ac_fn_c_check_header_mongrel "$LINENO" "limits.h" "ac_cv_header_limits_h" "$ac_includes_default" 
    4825 if test "x$ac_cv_header_limits_h" = xyes; then : 
     4801if test "x$ac_cv_header_limits_h" = x""yes; then : 
    48264802  $as_echo "#define PJ_HAS_LIMITS_H 1" >>confdefs.h 
    48274803 
    … …  
    48304806 
    48314807ac_fn_c_check_header_mongrel "$LINENO" "malloc.h" "ac_cv_header_malloc_h" "$ac_includes_default" 
    4832 if test "x$ac_cv_header_malloc_h" = xyes; then : 
     4808if test "x$ac_cv_header_malloc_h" = x""yes; then : 
    48334809  $as_echo "#define PJ_HAS_MALLOC_H 1" >>confdefs.h 
    48344810 
    … …  
    48374813 
    48384814ac_fn_c_check_header_mongrel "$LINENO" "netdb.h" "ac_cv_header_netdb_h" "$ac_includes_default" 
    4839 if test "x$ac_cv_header_netdb_h" = xyes; then : 
     4815if test "x$ac_cv_header_netdb_h" = x""yes; then : 
    48404816  $as_echo "#define PJ_HAS_NETDB_H 1" >>confdefs.h 
    48414817 
    … …  
    48444820 
    48454821ac_fn_c_check_header_mongrel "$LINENO" "netinet/in_systm.h" "ac_cv_header_netinet_in_systm_h" "$ac_includes_default" 
    4846 if test "x$ac_cv_header_netinet_in_systm_h" = xyes; then : 
     4822if test "x$ac_cv_header_netinet_in_systm_h" = x""yes; then : 
    48474823  $as_echo "#define PJ_HAS_NETINET_IN_SYSTM_H 1" >>confdefs.h 
    48484824 
    … …  
    48514827 
    48524828ac_fn_c_check_header_mongrel "$LINENO" "netinet/in.h" "ac_cv_header_netinet_in_h" "$ac_includes_default" 
    4853 if test "x$ac_cv_header_netinet_in_h" = xyes; then : 
     4829if test "x$ac_cv_header_netinet_in_h" = x""yes; then : 
    48544830  $as_echo "#define PJ_HAS_NETINET_IN_H 1" >>confdefs.h 
    48554831 
    … …  
    48684844 
    48694845" 
    4870 if test "x$ac_cv_header_netinet_ip_h" = xyes; then : 
     4846if test "x$ac_cv_header_netinet_ip_h" = x""yes; then : 
    48714847  $as_echo "#define PJ_HAS_NETINET_IP_H 1" >>confdefs.h 
    48724848 
    … …  
    48754851 
    48764852ac_fn_c_check_header_mongrel "$LINENO" "netinet/tcp.h" "ac_cv_header_netinet_tcp_h" "$ac_includes_default" 
    4877 if test "x$ac_cv_header_netinet_tcp_h" = xyes; then : 
     4853if test "x$ac_cv_header_netinet_tcp_h" = x""yes; then : 
    48784854  $as_echo "#define PJ_HAS_NETINET_TCP_H 1" >>confdefs.h 
    48794855 
    … …  
    48824858 
    48834859ac_fn_c_check_header_mongrel "$LINENO" "ifaddrs.h" "ac_cv_header_ifaddrs_h" "$ac_includes_default" 
    4884 if test "x$ac_cv_header_ifaddrs_h" = xyes; then : 
     4860if test "x$ac_cv_header_ifaddrs_h" = x""yes; then : 
    48854861  ac_fn_c_check_func "$LINENO" "getifaddrs" "ac_cv_func_getifaddrs" 
    4886 if test "x$ac_cv_func_getifaddrs" = xyes; then : 
     4862if test "x$ac_cv_func_getifaddrs" = x""yes; then : 
    48874863  $as_echo "#define PJ_HAS_IFADDRS_H 1" >>confdefs.h 
    48884864 
    … …  
    48934869 
    48944870ac_fn_c_check_header_mongrel "$LINENO" "semaphore.h" "ac_cv_header_semaphore_h" "$ac_includes_default" 
    4895 if test "x$ac_cv_header_semaphore_h" = xyes; then : 
     4871if test "x$ac_cv_header_semaphore_h" = x""yes; then : 
    48964872  $as_echo "#define PJ_HAS_SEMAPHORE_H 1" >>confdefs.h 
    48974873 
    … …  
    49004876 
    49014877ac_fn_c_check_header_mongrel "$LINENO" "setjmp.h" "ac_cv_header_setjmp_h" "$ac_includes_default" 
    4902 if test "x$ac_cv_header_setjmp_h" = xyes; then : 
     4878if test "x$ac_cv_header_setjmp_h" = x""yes; then : 
    49034879  $as_echo "#define PJ_HAS_SETJMP_H 1" >>confdefs.h 
    49044880 
    … …  
    49074883 
    49084884ac_fn_c_check_header_mongrel "$LINENO" "stdarg.h" "ac_cv_header_stdarg_h" "$ac_includes_default" 
    4909 if test "x$ac_cv_header_stdarg_h" = xyes; then : 
     4885if test "x$ac_cv_header_stdarg_h" = x""yes; then : 
    49104886  $as_echo "#define PJ_HAS_STDARG_H 1" >>confdefs.h 
    49114887 
    … …  
    49144890 
    49154891ac_fn_c_check_header_mongrel "$LINENO" "stddef.h" "ac_cv_header_stddef_h" "$ac_includes_default" 
    4916 if test "x$ac_cv_header_stddef_h" = xyes; then : 
     4892if test "x$ac_cv_header_stddef_h" = x""yes; then : 
    49174893  $as_echo "#define PJ_HAS_STDDEF_H 1" >>confdefs.h 
    49184894 
    … …  
    49214897 
    49224898ac_fn_c_check_header_mongrel "$LINENO" "stdio.h" "ac_cv_header_stdio_h" "$ac_includes_default" 
    4923 if test "x$ac_cv_header_stdio_h" = xyes; then : 
     4899if test "x$ac_cv_header_stdio_h" = x""yes; then : 
    49244900  $as_echo "#define PJ_HAS_STDIO_H 1" >>confdefs.h 
    49254901 
    … …  
    49284904 
    49294905ac_fn_c_check_header_mongrel "$LINENO" "stdint.h" "ac_cv_header_stdint_h" "$ac_includes_default" 
    4930 if test "x$ac_cv_header_stdint_h" = xyes; then : 
     4906if test "x$ac_cv_header_stdint_h" = x""yes; then : 
    49314907  $as_echo "#define PJ_HAS_STDINT_H 1" >>confdefs.h 
    49324908 
    … …  
    49354911 
    49364912ac_fn_c_check_header_mongrel "$LINENO" "stdlib.h" "ac_cv_header_stdlib_h" "$ac_includes_default" 
    4937 if test "x$ac_cv_header_stdlib_h" = xyes; then : 
     4913if test "x$ac_cv_header_stdlib_h" = x""yes; then : 
    49384914  $as_echo "#define PJ_HAS_STDLIB_H 1" >>confdefs.h 
    49394915 
    … …  
    49424918 
    49434919ac_fn_c_check_header_mongrel "$LINENO" "string.h" "ac_cv_header_string_h" "$ac_includes_default" 
    4944 if test "x$ac_cv_header_string_h" = xyes; then : 
     4920if test "x$ac_cv_header_string_h" = x""yes; then : 
    49454921  $as_echo "#define PJ_HAS_STRING_H 1" >>confdefs.h 
    49464922 
    … …  
    49494925 
    49504926ac_fn_c_check_header_mongrel "$LINENO" "sys/ioctl.h" "ac_cv_header_sys_ioctl_h" "$ac_includes_default" 
    4951 if test "x$ac_cv_header_sys_ioctl_h" = xyes; then : 
     4927if test "x$ac_cv_header_sys_ioctl_h" = x""yes; then : 
    49524928  $as_echo "#define PJ_HAS_SYS_IOCTL_H 1" >>confdefs.h 
    49534929 
    … …  
    49564932 
    49574933ac_fn_c_check_header_mongrel "$LINENO" "sys/select.h" "ac_cv_header_sys_select_h" "$ac_includes_default" 
    4958 if test "x$ac_cv_header_sys_select_h" = xyes; then : 
     4934if test "x$ac_cv_header_sys_select_h" = x""yes; then : 
    49594935  $as_echo "#define PJ_HAS_SYS_SELECT_H 1" >>confdefs.h 
    49604936 
    … …  
    49634939 
    49644940ac_fn_c_check_header_mongrel "$LINENO" "sys/socket.h" "ac_cv_header_sys_socket_h" "$ac_includes_default" 
    4965 if test "x$ac_cv_header_sys_socket_h" = xyes; then : 
     4941if test "x$ac_cv_header_sys_socket_h" = x""yes; then : 
    49664942  $as_echo "#define PJ_HAS_SYS_SOCKET_H 1" >>confdefs.h 
    49674943 
    … …  
    49704946 
    49714947ac_fn_c_check_header_mongrel "$LINENO" "sys/time.h" "ac_cv_header_sys_time_h" "$ac_includes_default" 
    4972 if test "x$ac_cv_header_sys_time_h" = xyes; then : 
     4948if test "x$ac_cv_header_sys_time_h" = x""yes; then : 
    49734949  $as_echo "#define PJ_HAS_SYS_TIME_H 1" >>confdefs.h 
    49744950 
    … …  
    49774953 
    49784954ac_fn_c_check_header_mongrel "$LINENO" "sys/timeb.h" "ac_cv_header_sys_timeb_h" "$ac_includes_default" 
    4979 if test "x$ac_cv_header_sys_timeb_h" = xyes; then : 
     4955if test "x$ac_cv_header_sys_timeb_h" = x""yes; then : 
    49804956  $as_echo "#define PJ_HAS_SYS_TIMEB_H 1" >>confdefs.h 
    49814957 
    … …  
    49844960 
    49854961ac_fn_c_check_header_mongrel "$LINENO" "sys/types.h" "ac_cv_header_sys_types_h" "$ac_includes_default" 
    4986 if test "x$ac_cv_header_sys_types_h" = xyes; then : 
     4962if test "x$ac_cv_header_sys_types_h" = x""yes; then : 
    49874963  $as_echo "#define PJ_HAS_SYS_TYPES_H 1" >>confdefs.h 
    49884964 
    … …  
    49914967 
    49924968ac_fn_c_check_header_mongrel "$LINENO" "sys/filio.h" "ac_cv_header_sys_filio_h" "$ac_includes_default" 
    4993 if test "x$ac_cv_header_sys_filio_h" = xyes; then : 
     4969if test "x$ac_cv_header_sys_filio_h" = x""yes; then : 
    49944970  $as_echo "#define PJ_HAS_SYS_FILIO_H 1" >>confdefs.h 
    49954971 
    … …  
    49984974 
    49994975ac_fn_c_check_header_mongrel "$LINENO" "sys/sockio.h" "ac_cv_header_sys_sockio_h" "$ac_includes_default" 
    5000 if test "x$ac_cv_header_sys_sockio_h" = xyes; then : 
     4976if test "x$ac_cv_header_sys_sockio_h" = x""yes; then : 
    50014977  $as_echo "#define PJ_HAS_SYS_SOCKIO_H 1" >>confdefs.h 
    50024978 
    … …  
    50054981 
    50064982ac_fn_c_check_header_mongrel "$LINENO" "sys/utsname.h" "ac_cv_header_sys_utsname_h" "$ac_includes_default" 
    5007 if test "x$ac_cv_header_sys_utsname_h" = xyes; then : 
     4983if test "x$ac_cv_header_sys_utsname_h" = x""yes; then : 
    50084984  $as_echo "#define PJ_HAS_SYS_UTSNAME_H 1" >>confdefs.h 
    50094985 
    … …  
    50124988 
    50134989ac_fn_c_check_header_mongrel "$LINENO" "time.h" "ac_cv_header_time_h" "$ac_includes_default" 
    5014 if test "x$ac_cv_header_time_h" = xyes; then : 
     4990if test "x$ac_cv_header_time_h" = x""yes; then : 
    50154991  $as_echo "#define PJ_HAS_TIME_H 1" >>confdefs.h 
    50164992 
    … …  
    50194995 
    50204996ac_fn_c_check_header_mongrel "$LINENO" "unistd.h" "ac_cv_header_unistd_h" "$ac_includes_default" 
    5021 if test "x$ac_cv_header_unistd_h" = xyes; then : 
     4997if test "x$ac_cv_header_unistd_h" = x""yes; then : 
    50224998  $as_echo "#define PJ_HAS_UNISTD_H 1" >>confdefs.h 
    50234999 
    … …  
    50265002 
    50275003ac_fn_c_check_header_mongrel "$LINENO" "winsock.h" "ac_cv_header_winsock_h" "$ac_includes_default" 
    5028 if test "x$ac_cv_header_winsock_h" = xyes; then : 
     5004if test "x$ac_cv_header_winsock_h" = x""yes; then : 
    50295005  $as_echo "#define PJ_HAS_WINSOCK_H 1" >>confdefs.h 
    50305006 
    … …  
    50335009 
    50345010ac_fn_c_check_header_mongrel "$LINENO" "winsock2.h" "ac_cv_header_winsock2_h" "$ac_includes_default" 
    5035 if test "x$ac_cv_header_winsock2_h" = xyes; then : 
     5011if test "x$ac_cv_header_winsock2_h" = x""yes; then : 
    50365012  $as_echo "#define PJ_HAS_WINSOCK2_H 1" >>confdefs.h 
    50375013 
    … …  
    50465022 
    50475023" 
    5048 if test "x$ac_cv_header_mswsock_h" = xyes; then : 
     5024if test "x$ac_cv_header_mswsock_h" = x""yes; then : 
    50495025  $as_echo "#define PJ_HAS_MSWSOCK_H 1" >>confdefs.h 
    50505026 
    … …  
    50535029 
    50545030ac_fn_c_check_header_mongrel "$LINENO" "ws2tcpip.h" "ac_cv_header_ws2tcpip_h" "$ac_includes_default" 
    5055 if test "x$ac_cv_header_ws2tcpip_h" = xyes; then : 
     5031if test "x$ac_cv_header_ws2tcpip_h" = x""yes; then : 
    50565032  $as_echo "#define PJ_HAS_WS2TCPIP_H 1" >>confdefs.h 
    50575033 
    … …  
    50605036 
    50615037ac_fn_c_check_header_mongrel "$LINENO" "uuid/uuid.h" "ac_cv_header_uuid_uuid_h" "$ac_includes_default" 
    5062 if test "x$ac_cv_header_uuid_uuid_h" = xyes; then : 
     5038if test "x$ac_cv_header_uuid_uuid_h" = x""yes; then : 
    50635039  ac_has_uuid_h=1 
    50645040fi 
    … …  
    50745050 
    50755051" 
    5076 if test "x$ac_cv_header_net_if_h" = xyes; then : 
     5052if test "x$ac_cv_header_net_if_h" = x""yes; then : 
    50775053  $as_echo "#define PJ_HAS_NET_IF_H 1" >>confdefs.h 
    50785054 
    … …  
    56255601 
    56265602ac_fn_c_check_header_mongrel "$LINENO" "sys/soundcard.h" "ac_cv_header_sys_soundcard_h" "$ac_includes_default" 
    5627 if test "x$ac_cv_header_sys_soundcard_h" = xyes; then : 
     5603if test "x$ac_cv_header_sys_soundcard_h" = x""yes; then : 
    56285604  ac_pa_cflags="$ac_pa_cflags -DHAVE_SYS_SOUNDCARD_H" 
    56295605fi 
    … …  
    56315607 
    56325608ac_fn_c_check_header_mongrel "$LINENO" "linux/soundcard.h" "ac_cv_header_linux_soundcard_h" "$ac_includes_default" 
    5633 if test "x$ac_cv_header_linux_soundcard_h" = xyes; then : 
     5609if test "x$ac_cv_header_linux_soundcard_h" = x""yes; then : 
    56345610  ac_pa_cflags="$ac_pa_cflags -DHAVE_LINUX_SOUNDCARD_H" 
    56355611fi 
    … …  
    56375613 
    56385614ac_fn_c_check_header_mongrel "$LINENO" "machine/soundcard.h" "ac_cv_header_machine_soundcard_h" "$ac_includes_default" 
    5639 if test "x$ac_cv_header_machine_soundcard_h" = xyes; then : 
     5615if test "x$ac_cv_header_machine_soundcard_h" = x""yes; then : 
    56405616  ac_pa_cflags="$ac_pa_cflags -DHAVE_MACHINE_SOUNDCARD_H" 
    56415617fi 
    … …  
    56855661                ac_pjmedia_snd=pa_unix 
    56865662        ac_fn_c_check_header_mongrel "$LINENO" "alsa/version.h" "ac_cv_header_alsa_version_h" "$ac_includes_default" 
    5687 if test "x$ac_cv_header_alsa_version_h" = xyes; then : 
     5663if test "x$ac_cv_header_alsa_version_h" = x""yes; then : 
    56885664  ac_pa_use_alsa=1 
    56895665 
    … …  
    59885964  enableval=$enable_libsamplerate;  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for src_new in -lsamplerate" >&5 
    59895965$as_echo_n "checking for src_new in -lsamplerate... " >&6; } 
    5990 if ${ac_cv_lib_samplerate_src_new+:} false; then : 
     5966if test "${ac_cv_lib_samplerate_src_new+set}" = set; then : 
    59915967  $as_echo_n "(cached) " >&6 
    59925968else 
    … …  
    60225998{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_samplerate_src_new" >&5 
    60235999$as_echo "$ac_cv_lib_samplerate_src_new" >&6; } 
    6024 if test "x$ac_cv_lib_samplerate_src_new" = xyes; then : 
     6000if test "x$ac_cv_lib_samplerate_src_new" = x""yes; then : 
    60256001  cat >>confdefs.h <<_ACEOF 
    60266002#define HAVE_LIBSAMPLERATE 1 
    … …  
    60776053else 
    60786054 
    6079                   SDL_CONFIG="sdl-config" 
    60806055                  if test "x$with_sdl" != "xno" -a "x$with_sdl" != "x"; then 
    6081                         SDL_CONFIG=$with_sdl/bin/sdl-config 
    60826056                        { $as_echo "$as_me:${as_lineno-$LINENO}: result: Using SDL prefix... $with_sdl" >&5 
    60836057$as_echo "Using SDL prefix... $with_sdl" >&6; } 
     6058                        for ac_prog in sdl-config sdl2-config 
     6059do 
     6060  # Extract the first word of "$ac_prog", so it can be a program name with args. 
     6061set dummy $ac_prog; ac_word=$2 
     6062{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 
     6063$as_echo_n "checking for $ac_word... " >&6; } 
     6064if test "${ac_cv_path_SDL_CONFIG+set}" = set; then : 
     6065  $as_echo_n "(cached) " >&6 
     6066else 
     6067  case $SDL_CONFIG in 
     6068  [\\/]* | ?:[\\/]*) 
     6069  ac_cv_path_SDL_CONFIG="$SDL_CONFIG" # Let the user override the test with a path. 
     6070  ;; 
     6071  *) 
     6072  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 
     6073for as_dir in $with_sdl/bin 
     6074do 
     6075  IFS=$as_save_IFS 
     6076  test -z "$as_dir" && as_dir=. 
     6077    for ac_exec_ext in '' $ac_executable_extensions; do 
     6078  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 
     6079    ac_cv_path_SDL_CONFIG="$as_dir/$ac_word$ac_exec_ext" 
     6080    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 
     6081    break 2 
     6082  fi 
     6083done 
     6084  done 
     6085IFS=$as_save_IFS 
     6086 
     6087  ;; 
     6088esac 
     6089fi 
     6090SDL_CONFIG=$ac_cv_path_SDL_CONFIG 
     6091if test -n "$SDL_CONFIG"; then 
     6092  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SDL_CONFIG" >&5 
     6093$as_echo "$SDL_CONFIG" >&6; } 
     6094else 
     6095  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 
     6096$as_echo "no" >&6; } 
     6097fi 
     6098 
     6099 
     6100  test -n "$SDL_CONFIG" && break 
     6101done 
     6102 
     6103                  else 
     6104                        for ac_prog in sdl-config sdl2-config 
     6105do 
     6106  # Extract the first word of "$ac_prog", so it can be a program name with args. 
     6107set dummy $ac_prog; ac_word=$2 
     6108{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 
     6109$as_echo_n "checking for $ac_word... " >&6; } 
     6110if test "${ac_cv_path_SDL_CONFIG+set}" = set; then : 
     6111  $as_echo_n "(cached) " >&6 
     6112else 
     6113  case $SDL_CONFIG in 
     6114  [\\/]* | ?:[\\/]*) 
     6115  ac_cv_path_SDL_CONFIG="$SDL_CONFIG" # Let the user override the test with a path. 
     6116  ;; 
     6117  *) 
     6118  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 
     6119for as_dir in $PATH 
     6120do 
     6121  IFS=$as_save_IFS 
     6122  test -z "$as_dir" && as_dir=. 
     6123    for ac_exec_ext in '' $ac_executable_extensions; do 
     6124  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 
     6125    ac_cv_path_SDL_CONFIG="$as_dir/$ac_word$ac_exec_ext" 
     6126    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 
     6127    break 2 
     6128  fi 
     6129done 
     6130  done 
     6131IFS=$as_save_IFS 
     6132 
     6133  ;; 
     6134esac 
     6135fi 
     6136SDL_CONFIG=$ac_cv_path_SDL_CONFIG 
     6137if test -n "$SDL_CONFIG"; then 
     6138  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SDL_CONFIG" >&5 
     6139$as_echo "$SDL_CONFIG" >&6; } 
     6140else 
     6141  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 
     6142$as_echo "no" >&6; } 
     6143fi 
     6144 
     6145 
     6146  test -n "$SDL_CONFIG" && break 
     6147done 
     6148 
    60846149                  fi 
    60856150 
    6086                   { $as_echo "$as_me:${as_lineno-$LINENO}: checking SDL availability.." >&5 
    6087 $as_echo_n "checking SDL availability..... " >&6; } 
    6088                   if (sh -c "$SDL_CONFIG --version" | grep 1.3) then 
    6089  
    6090  
    6091                           ac_sdl_cflags=`$SDL_CONFIG --cflags` 
    6092                           ac_sdl_cflags="-DPJMEDIA_VIDEO_DEV_HAS_SDL=1 $ac_sdl_cflags" 
    6093                           ac_sdl_ldflags=`$SDL_CONFIG --libs` 
    6094                           LIBS="$LIBS $ac_sdl_ldflags" 
    6095                    else 
     6151                  { $as_echo "$as_me:${as_lineno-$LINENO}: checking SDL availability" >&5 
     6152$as_echo_n "checking SDL availability... " >&6; } 
     6153                  if test "x$SDL_CONFIG" = "x"; then 
     6154                        { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 
     6155$as_echo "not found" >&6; } 
     6156                  elif (sh -c "$SDL_CONFIG --version" | grep -e '^1\.3' -e '^2\.') then 
     6157 
     6158 
     6159                        ac_sdl_cflags=`$SDL_CONFIG --cflags` 
     6160                        ac_sdl_cflags="-DPJMEDIA_VIDEO_DEV_HAS_SDL=1 $ac_sdl_cflags" 
     6161                        ac_sdl_ldflags=`$SDL_CONFIG --libs` 
     6162                        LIBS="$LIBS $ac_sdl_ldflags" 
     6163                  else 
    60966164                        { $as_echo "$as_me:${as_lineno-$LINENO}: result: Unsupported SDL version" >&5 
    60976165$as_echo "Unsupported SDL version" >&6; } 
    6098                    fi 
     6166                  fi 
    60996167 
    61006168fi 
    … …  
    61476215{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 
    61486216$as_echo_n "checking for $ac_word... " >&6; } 
    6149 if ${ac_cv_prog_PKG_CONFIG+:} false; then : 
     6217if test "${ac_cv_prog_PKG_CONFIG+set}" = set; then : 
    61506218  $as_echo_n "(cached) " >&6 
    61516219else 
    … …  
    61596227  test -z "$as_dir" && as_dir=. 
    61606228    for ac_exec_ext in '' $ac_executable_extensions; do 
    6161   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 
     6229  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 
    61626230    ac_cv_prog_PKG_CONFIG="$ac_prog" 
    61636231    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 
    … …  
    62366304                        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for avdevice_version in -lavdevice" >&5 
    62376305$as_echo_n "checking for avdevice_version in -lavdevice... " >&6; } 
    6238 if ${ac_cv_lib_avdevice_avdevice_version+:} false; then : 
     6306if test "${ac_cv_lib_avdevice_avdevice_version+set}" = set; then : 
    62396307  $as_echo_n "(cached) " >&6 
    62406308else 
    … …  
    62706338{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_avdevice_avdevice_version" >&5 
    62716339$as_echo "$ac_cv_lib_avdevice_avdevice_version" >&6; } 
    6272 if test "x$ac_cv_lib_avdevice_avdevice_version" = xyes; then : 
     6340if test "x$ac_cv_lib_avdevice_avdevice_version" = x""yes; then : 
    62736341  ac_ffmpeg_cflags="$ac_ffmpeg_cflags -DPJMEDIA_HAS_LIBAVDEVICE=1" 
    62746342                                      ac_ffmpeg_ldflags="$ac_ffmpeg_ldflags -lavdevice" 
    … …  
    62796347                        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for av_malloc in -lavutil" >&5 
    62806348$as_echo_n "checking for av_malloc in -lavutil... " >&6; } 
    6281 if ${ac_cv_lib_avutil_av_malloc+:} false; then : 
     6349if test "${ac_cv_lib_avutil_av_malloc+set}" = set; then : 
    62826350  $as_echo_n "(cached) " >&6 
    62836351else 
    … …  
    63136381{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_avutil_av_malloc" >&5 
    63146382$as_echo "$ac_cv_lib_avutil_av_malloc" >&6; } 
    6315 if test "x$ac_cv_lib_avutil_av_malloc" = xyes; then : 
     6383if test "x$ac_cv_lib_avutil_av_malloc" = x""yes; then : 
    63166384  ac_ffmpeg_cflags="$ac_ffmpeg_cflags -DPJMEDIA_HAS_LIBAVUTIL=1" 
    63176385                                      ac_ffmpeg_ldflags="$ac_ffmpeg_ldflags -lavutil" 
    … …  
    63226390                        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for avcodec_init in -lavcodec" >&5 
    63236391$as_echo_n "checking for avcodec_init in -lavcodec... " >&6; } 
    6324 if ${ac_cv_lib_avcodec_avcodec_init+:} false; then : 
     6392if test "${ac_cv_lib_avcodec_avcodec_init+set}" = set; then : 
    63256393  $as_echo_n "(cached) " >&6 
    63266394else 
    … …  
    63576425{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_avcodec_avcodec_init" >&5 
    63586426$as_echo "$ac_cv_lib_avcodec_avcodec_init" >&6; } 
    6359 if test "x$ac_cv_lib_avcodec_avcodec_init" = xyes; then : 
     6427if test "x$ac_cv_lib_avcodec_avcodec_init" = x""yes; then : 
    63606428  ac_ffmpeg_cflags="$ac_ffmpeg_cflags -DPJMEDIA_HAS_LIBAVCODEC=1" 
    63616429                                      ac_ffmpeg_ldflags="$ac_ffmpeg_ldflags -lavcodec" 
    … …  
    63656433                        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for av_register_all in -lavformat" >&5 
    63666434$as_echo_n "checking for av_register_all in -lavformat... " >&6; } 
    6367 if ${ac_cv_lib_avformat_av_register_all+:} false; then : 
     6435if test "${ac_cv_lib_avformat_av_register_all+set}" = set; then : 
    63686436  $as_echo_n "(cached) " >&6 
    63696437else 
    … …  
    64006468{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_avformat_av_register_all" >&5 
    64016469$as_echo "$ac_cv_lib_avformat_av_register_all" >&6; } 
    6402 if test "x$ac_cv_lib_avformat_av_register_all" = xyes; then : 
     6470if test "x$ac_cv_lib_avformat_av_register_all" = x""yes; then : 
    64036471  ac_ffmpeg_cflags="$ac_ffmpeg_cflags -DPJMEDIA_HAS_LIBAVFORMAT=1" 
    64046472                                      ac_ffmpeg_ldflags="$ac_ffmpeg_ldflags -lavformat" 
    … …  
    64086476                        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sws_scale in -lswscale" >&5 
    64096477$as_echo_n "checking for sws_scale in -lswscale... " >&6; } 
    6410 if ${ac_cv_lib_swscale_sws_scale+:} false; then : 
     6478if test "${ac_cv_lib_swscale_sws_scale+set}" = set; then : 
    64116479  $as_echo_n "(cached) " >&6 
    64126480else 
    … …  
    64436511{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_swscale_sws_scale" >&5 
    64446512$as_echo "$ac_cv_lib_swscale_sws_scale" >&6; } 
    6445 if test "x$ac_cv_lib_swscale_sws_scale" = xyes; then : 
     6513if test "x$ac_cv_lib_swscale_sws_scale" = x""yes; then : 
    64466514  ac_ffmpeg_cflags="$ac_ffmpeg_cflags -DPJMEDIA_HAS_LIBSWSCALE=1" 
    64476515                                      ac_ffmpeg_ldflags="$ac_ffmpeg_ldflags -lswscale" 
    … …  
    64516519                        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for avcore_version in -lavcore" >&5 
    64526520$as_echo_n "checking for avcore_version in -lavcore... " >&6; } 
    6453 if ${ac_cv_lib_avcore_avcore_version+:} false; then : 
     6521if test "${ac_cv_lib_avcore_avcore_version+set}" = set; then : 
    64546522  $as_echo_n "(cached) " >&6 
    64556523else 
    … …  
    64856553{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_avcore_avcore_version" >&5 
    64866554$as_echo "$ac_cv_lib_avcore_avcore_version" >&6; } 
    6487 if test "x$ac_cv_lib_avcore_avcore_version" = xyes; then : 
     6555if test "x$ac_cv_lib_avcore_avcore_version" = x""yes; then : 
    64886556  ac_ffmpeg_cflags="$ac_ffmpeg_cflags -DPJMEDIA_HAS_LIBAVCORE=1" 
    64896557                                      ac_ffmpeg_ldflags="$ac_ffmpeg_ldflags -lavcore" 
    … …  
    65166584                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for v4l2_open in -lv4l2" >&5 
    65176585$as_echo_n "checking for v4l2_open in -lv4l2... " >&6; } 
    6518 if ${ac_cv_lib_v4l2_v4l2_open+:} false; then : 
     6586if test "${ac_cv_lib_v4l2_v4l2_open+set}" = set; then : 
    65196587  $as_echo_n "(cached) " >&6 
    65206588else 
    … …  
    65506618{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_v4l2_v4l2_open" >&5 
    65516619$as_echo "$ac_cv_lib_v4l2_v4l2_open" >&6; } 
    6552 if test "x$ac_cv_lib_v4l2_v4l2_open" = xyes; then : 
     6620if test "x$ac_cv_lib_v4l2_v4l2_open" = x""yes; then : 
    65536621  ac_v4l2_cflags="-DPJMEDIA_VIDEO_DEV_HAS_V4L2=1" 
    65546622                              ac_v4l2_ldflags="-lv4l2" 
    … …  
    67116779$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 
    67126780as_fn_error $? "Error: unable to recognize your IPP installation. Make sure the paths and ARCH suffix are set correctly, run with --help for more info 
    6713 See \`config.log' for more details" "$LINENO" 5; } 
     6781See \`config.log' for more details" "$LINENO" 5 ; } 
    67146782fi 
    67156783rm -f core conftest.err conftest.$ac_objext \ 
    … …  
    67676835$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 
    67686836as_fn_error $? "Unable to find to find built binaries under $IPPSAMPLES/speech-codecs/{bin,_bin}. Have you built the IPP samples? 
    6769 See \`config.log' for more details" "$LINENO" 5; } 
     6837See \`config.log' for more details" "$LINENO" 5 ; } 
    67706838            fi 
    67716839        else 
    … …  
    67736841$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 
    67746842as_fn_error $? "unable to find $IPPSAMPLES/speech-codecs/bin/*gcc*/lib or $IPPSAMPLES/speech-codecs/_bin/*gcc*/lib directory. Have you built the samples? 
    6775 See \`config.log' for more details" "$LINENO" 5; } 
     6843See \`config.log' for more details" "$LINENO" 5 ; } 
    67766844        fi 
    67776845 
    … …  
    67816849$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 
    67826850as_fn_error $? "There's something wrong with this script, directory $IPPSAMP_DIR does not exist 
    6783 See \`config.log' for more details" "$LINENO" 5; } 
     6851See \`config.log' for more details" "$LINENO" 5 ; } 
    67846852            exit 1; 
    67856853        fi 
    … …  
    67956863$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 
    67966864as_fn_error $? "bug in this script: unsupported IPP version 
    6797 See \`config.log' for more details" "$LINENO" 5; } 
     6865See \`config.log' for more details" "$LINENO" 5 ; } 
    67986866        fi 
    67996867 
    … …  
    68026870$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 
    68036871as_fn_error $? "$IPPSAMP_LIBS doesn't exist in $IPPSAMP_DIR 
    6804 See \`config.log' for more details" "$LINENO" 5; } 
     6872See \`config.log' for more details" "$LINENO" 5 ; } 
    68056873        fi 
    68066874 
    … …  
    68386906$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 
    68396907as_fn_error $? "failed 
    6840 See \`config.log' for more details" "$LINENO" 5; } 
     6908See \`config.log' for more details" "$LINENO" 5 ; } 
    68416909fi 
    68426910rm -f core conftest.err conftest.$ac_objext \ 
    … …  
    69056973 
    69066974                ac_fn_c_check_header_mongrel "$LINENO" "openssl/ssl.h" "ac_cv_header_openssl_ssl_h" "$ac_includes_default" 
    6907 if test "x$ac_cv_header_openssl_ssl_h" = xyes; then : 
     6975if test "x$ac_cv_header_openssl_ssl_h" = x""yes; then : 
    69086976  openssl_h_present=1 
    69096977fi 
    … …  
    69126980                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ERR_load_BIO_strings in -lcrypto" >&5 
    69136981$as_echo_n "checking for ERR_load_BIO_strings in -lcrypto... " >&6; } 
    6914 if ${ac_cv_lib_crypto_ERR_load_BIO_strings+:} false; then : 
     6982if test "${ac_cv_lib_crypto_ERR_load_BIO_strings+set}" = set; then : 
    69156983  $as_echo_n "(cached) " >&6 
    69166984else 
    … …  
    69467014{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_ERR_load_BIO_strings" >&5 
    69477015$as_echo "$ac_cv_lib_crypto_ERR_load_BIO_strings" >&6; } 
    6948 if test "x$ac_cv_lib_crypto_ERR_load_BIO_strings" = xyes; then : 
     7016if test "x$ac_cv_lib_crypto_ERR_load_BIO_strings" = x""yes; then : 
    69497017  libcrypto_present=1 && LIBS="$LIBS -lcrypto" 
    69507018fi 
    … …  
    69527020                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL_library_init in -lssl" >&5 
    69537021$as_echo_n "checking for SSL_library_init in -lssl... " >&6; } 
    6954 if ${ac_cv_lib_ssl_SSL_library_init+:} false; then : 
     7022if test "${ac_cv_lib_ssl_SSL_library_init+set}" = set; then : 
    69557023  $as_echo_n "(cached) " >&6 
    69567024else 
    … …  
    69867054{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_SSL_library_init" >&5 
    69877055$as_echo "$ac_cv_lib_ssl_SSL_library_init" >&6; } 
    6988 if test "x$ac_cv_lib_ssl_SSL_library_init" = xyes; then : 
     7056if test "x$ac_cv_lib_ssl_SSL_library_init" = x""yes; then : 
    69897057  libssl_present=1 && LIBS="$LIBS -lssl" 
    69907058fi 
    … …  
    70447112 
    70457113                ac_fn_c_check_header_mongrel "$LINENO" "opencore-amrnb/interf_enc.h" "ac_cv_header_opencore_amrnb_interf_enc_h" "$ac_includes_default" 
    7046 if test "x$ac_cv_header_opencore_amrnb_interf_enc_h" = xyes; then : 
     7114if test "x$ac_cv_header_opencore_amrnb_interf_enc_h" = x""yes; then : 
    70477115  opencore_amrnb_h_present=1 
    70487116fi 
    … …  
    70517119                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Encoder_Interface_init in -lopencore-amrnb" >&5 
    70527120$as_echo_n "checking for Encoder_Interface_init in -lopencore-amrnb... " >&6; } 
    7053 if ${ac_cv_lib_opencore_amrnb_Encoder_Interface_init+:} false; then : 
     7121if test "${ac_cv_lib_opencore_amrnb_Encoder_Interface_init+set}" = set; then : 
    70547122  $as_echo_n "(cached) " >&6 
    70557123else 
    … …  
    70857153{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_opencore_amrnb_Encoder_Interface_init" >&5 
    70867154$as_echo "$ac_cv_lib_opencore_amrnb_Encoder_Interface_init" >&6; } 
    7087 if test "x$ac_cv_lib_opencore_amrnb_Encoder_Interface_init" = xyes; then : 
     7155if test "x$ac_cv_lib_opencore_amrnb_Encoder_Interface_init" = x""yes; then : 
    70887156  opencore_amrnb_present=1 && LIBS="$LIBS -lopencore-amrnb" 
    70897157fi 
    … …  
    72587326if diff "$cache_file" confcache >/dev/null 2>&1; then :; else 
    72597327  if test -w "$cache_file"; then 
    7260     if test "x$cache_file" != "x/dev/null"; then 
     7328    test "x$cache_file" != "x/dev/null" && 
    72617329      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 
    72627330$as_echo "$as_me: updating cache $cache_file" >&6;} 
    7263       if test ! -f "$cache_file" || test -h "$cache_file"; then 
    7264         cat confcache >"$cache_file" 
    7265       else 
    7266         case $cache_file in #( 
    7267         */* | ?:*) 
    7268           mv -f confcache "$cache_file"$$ && 
    7269           mv -f "$cache_file"$$ "$cache_file" ;; #( 
    7270         *) 
    7271           mv -f confcache "$cache_file" ;; 
    7272         esac 
    7273       fi 
    7274     fi 
     7331    cat confcache >$cache_file 
    72757332  else 
    72767333    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 
    … …  
    73057362 
    73067363 
    7307 : "${CONFIG_STATUS=./config.status}" 
     7364: ${CONFIG_STATUS=./config.status} 
    73087365ac_write_fail=0 
    73097366ac_clean_files_save=$ac_clean_files 
    … …  
    74067463 
    74077464# Find who we are.  Look in the path if we contain no directory separator. 
    7408 as_myself= 
    74097465case $0 in #(( 
    74107466  *[\\/]* ) as_myself=$0 ;; 
    … …  
    76027658    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. 
    76037659    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. 
    7604     # In both cases, we have to default to `cp -pR'. 
     7660    # In both cases, we have to default to `cp -p'. 
    76057661    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || 
    7606       as_ln_s='cp -pR' 
     7662      as_ln_s='cp -p' 
    76077663  elif ln conf$$.file conf$$ 2>/dev/null; then 
    76087664    as_ln_s=ln 
    76097665  else 
    7610     as_ln_s='cp -pR' 
     7666    as_ln_s='cp -p' 
    76117667  fi 
    76127668else 
    7613   as_ln_s='cp -pR' 
     7669  as_ln_s='cp -p' 
    76147670fi 
    76157671rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file 
    … …  
    76717727fi 
    76727728 
    7673  
    7674 # as_fn_executable_p FILE 
    7675 # ----------------------- 
    7676 # Test if FILE is an executable regular file. 
    7677 as_fn_executable_p () 
    7678 { 
    7679   test -f "$1" && test -x "$1" 
    7680 } # as_fn_executable_p 
    7681 as_test_x='test -x' 
    7682 as_executable_p=as_fn_executable_p 
     7729if test -x / >/dev/null 2>&1; then 
     7730  as_test_x='test -x' 
     7731else 
     7732  if ls -dL / >/dev/null 2>&1; then 
     7733    as_ls_L_option=L 
     7734  else 
     7735    as_ls_L_option= 
     7736  fi 
     7737  as_test_x=' 
     7738    eval sh -c '\'' 
     7739      if test -d "$1"; then 
     7740        test -d "$1/."; 
     7741      else 
     7742        case $1 in #( 
     7743        -*)set "./$1";; 
     7744        esac; 
     7745        case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( 
     7746        ???[sx]*):;;*)false;;esac;fi 
     7747    '\'' sh 
     7748  ' 
     7749fi 
     7750as_executable_p=$as_test_x 
    76837751 
    76847752# Sed expression to map a string onto a valid CPP name. 
    … …  
    77027770ac_log=" 
    77037771This file was extended by pjproject $as_me 2.x, which was 
    7704 generated by GNU Autoconf 2.69.  Invocation command line was 
     7772generated by GNU Autoconf 2.67.  Invocation command line was 
    77057773 
    77067774  CONFIG_FILES    = $CONFIG_FILES 
    … …  
    77647832ac_cs_version="\\ 
    77657833pjproject config.status 2.x 
    7766 configured by $0, generated by GNU Autoconf 2.69, 
     7834configured by $0, generated by GNU Autoconf 2.67, 
    77677835  with options \\"\$ac_cs_config\\" 
    77687836 
    7769 Copyright (C) 2012 Free Software Foundation, Inc. 
     7837Copyright (C) 2010 Free Software Foundation, Inc. 
    77707838This config.status script is free software; the Free Software Foundation 
    77717839gives unlimited permission to copy, distribute and modify it." 
    … …  
    78557923cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 
    78567924if \$ac_cs_recheck; then 
    7857   set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion 
     7925  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion 
    78587926  shift 
    78597927  \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 
    … …  
    78997967    "third_party/build/portaudio/os-auto.mak") CONFIG_FILES="$CONFIG_FILES third_party/build/portaudio/os-auto.mak" ;; 
    79007968 
    7901   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; 
     7969  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;; 
    79027970  esac 
    79037971done 
    … …  
    79217989$debug || 
    79227990{ 
    7923   tmp= ac_tmp= 
     7991  tmp= 
    79247992  trap 'exit_status=$? 
    7925   : "${ac_tmp:=$tmp}" 
    7926   { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status 
     7993  { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status 
    79277994' 0 
    79287995  trap 'as_fn_exit 1' 1 2 13 15 
    … …  
    79327999{ 
    79338000  tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && 
    7934   test -d "$tmp" 
     8001  test -n "$tmp" && test -d "$tmp" 
    79358002}  || 
    79368003{ 
    … …  
    79388005  (umask 077 && mkdir "$tmp") 
    79398006} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 
    7940 ac_tmp=$tmp 
    79418007 
    79428008# Set up the scripts for CONFIG_FILES section. 
    … …  
    79608026fi 
    79618027 
    7962 echo 'BEGIN {' >"$ac_tmp/subs1.awk" && 
     8028echo 'BEGIN {' >"$tmp/subs1.awk" && 
    79638029_ACEOF 
    79648030 
    … …  
    79888054 
    79898055cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 
    7990 cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK && 
     8056cat >>"\$tmp/subs1.awk" <<\\_ACAWK && 
    79918057_ACEOF 
    79928058sed -n ' 
    … …  
    80368102cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 
    80378103_ACAWK 
    8038 cat >>"\$ac_tmp/subs1.awk" <<_ACAWK && 
     8104cat >>"\$tmp/subs1.awk" <<_ACAWK && 
    80398105  for (key in S) S_is_set[key] = 1 
    80408106  FS = "" 
    … …  
    80688134else 
    80698135  cat 
    8070 fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \ 
     8136fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ 
    80718137  || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 
    80728138_ACEOF 
    … …  
    81028168# This happens for instance with `./config.status Makefile'. 
    81038169if test -n "$CONFIG_HEADERS"; then 
    8104 cat >"$ac_tmp/defines.awk" <<\_ACAWK || 
     8170cat >"$tmp/defines.awk" <<\_ACAWK || 
    81058171BEGIN { 
    81068172_ACEOF 
    … …  
    81148180ac_delim='%!_!# ' 
    81158181for ac_last_try in false false :; do 
    8116   ac_tt=`sed -n "/$ac_delim/p" confdefs.h` 
    8117   if test -z "$ac_tt"; then 
     8182  ac_t=`sed -n "/$ac_delim/p" confdefs.h` 
     8183  if test -z "$ac_t"; then 
    81188184    break 
    81198185  elif $ac_last_try; then 
    … …  
    82168282  case $ac_mode$ac_tag in 
    82178283  :[FHL]*:*);; 
    8218   :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; 
     8284  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;; 
    82198285  :[FH]-) ac_tag=-:-;; 
    82208286  :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; 
    … …  
    82358301    do 
    82368302      case $ac_f in 
    8237       -) ac_f="$ac_tmp/stdin";; 
     8303      -) ac_f="$tmp/stdin";; 
    82388304      *) # Look for the file first in the build tree, then in the source tree 
    82398305         # (if the path is not absolute).  The absolute path cannot be DOS-style, 
    … …  
    82448310           *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; 
    82458311           esac || 
    8246            as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; 
     8312           as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;; 
    82478313      esac 
    82488314      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac 
    … …  
    82708336 
    82718337    case $ac_tag in 
    8272     *:-:* | *:-) cat >"$ac_tmp/stdin" \ 
    8273       || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; 
     8338    *:-:* | *:-) cat >"$tmp/stdin" \ 
     8339      || as_fn_error $? "could not create $ac_file" "$LINENO" 5  ;; 
    82748340    esac 
    82758341    ;; 
    … …  
    83968462$ac_datarootdir_hack 
    83978463" 
    8398 eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \ 
    8399   >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5 
     8464eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ 
     8465  || as_fn_error $? "could not create $ac_file" "$LINENO" 5 
    84008466 
    84018467test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && 
    8402   { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } && 
    8403   { ac_out=`sed -n '/^[  ]*datarootdir[  ]*:*=/p' \ 
    8404       "$ac_tmp/out"`; test -z "$ac_out"; } && 
     8468  { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && 
     8469  { ac_out=`sed -n '/^[  ]*datarootdir[  ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && 
    84058470  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' 
    84068471which seems to be undefined.  Please make sure it is defined" >&5 
    … …  
    84088473which seems to be undefined.  Please make sure it is defined" >&2;} 
    84098474 
    8410   rm -f "$ac_tmp/stdin" 
     8475  rm -f "$tmp/stdin" 
    84118476  case $ac_file in 
    8412   -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";; 
    8413   *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";; 
     8477  -) cat "$tmp/out" && rm -f "$tmp/out";; 
     8478  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; 
    84148479  esac \ 
    84158480  || as_fn_error $? "could not create $ac_file" "$LINENO" 5 
    … …  
    84228487    { 
    84238488      $as_echo "/* $configure_input  */" \ 
    8424       && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" 
    8425     } >"$ac_tmp/config.h" \ 
     8489      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" 
     8490    } >"$tmp/config.h" \ 
    84268491      || as_fn_error $? "could not create $ac_file" "$LINENO" 5 
    8427     if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then 
     8492    if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then 
    84288493      { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 
    84298494$as_echo "$as_me: $ac_file is unchanged" >&6;} 
    84308495    else 
    84318496      rm -f "$ac_file" 
    8432       mv "$ac_tmp/config.h" "$ac_file" \ 
     8497      mv "$tmp/config.h" "$ac_file" \ 
    84338498        || as_fn_error $? "could not create $ac_file" "$LINENO" 5 
    84348499    fi 
    84358500  else 
    84368501    $as_echo "/* $configure_input  */" \ 
    8437       && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \ 
     8502      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \ 
    84388503      || as_fn_error $? "could not create -" "$LINENO" 5 
    84398504  fi 

  • pjproject/trunk/aconfigure.ac

    r4149 r4157  
    853853              ], 
    854854              [ 
    855                   SDL_CONFIG="sdl-config" 
    856855                  if test "x$with_sdl" != "xno" -a "x$with_sdl" != "x"; then 
    857                         SDL_CONFIG=$with_sdl/bin/sdl-config 
    858856                        AC_MSG_RESULT([Using SDL prefix... $with_sdl]) 
     857                        AC_PATH_PROGS(SDL_CONFIG,sdl-config sdl2-config,,$with_sdl/bin) 
     858                  else 
     859                        AC_PATH_PROGS(SDL_CONFIG, sdl-config sdl2-config) 
    859860                  fi 
    860                
    861                   AC_MSG_CHECKING([SDL availability..]) 
    862                   if (sh -c "$SDL_CONFIG --version" | grep 1.3) then 
    863                           AC_SUBST(ac_sdl_cflags) 
    864                           AC_SUBST(ac_sdl_ldflags) 
    865                           ac_sdl_cflags=`$SDL_CONFIG --cflags` 
    866                           ac_sdl_cflags="-DPJMEDIA_VIDEO_DEV_HAS_SDL=1 $ac_sdl_cflags" 
    867                           ac_sdl_ldflags=`$SDL_CONFIG --libs` 
    868                           LIBS="$LIBS $ac_sdl_ldflags" 
    869                    else 
     861                   
     862                  AC_MSG_CHECKING([SDL availability]) 
     863                  if test "x$SDL_CONFIG" = "x"; then 
     864                        AC_MSG_RESULT([not found]) 
     865                  elif (sh -c "$SDL_CONFIG --version" | grep -e '^1\.3' -e '^2\.') then 
     866                        AC_SUBST(ac_sdl_cflags) 
     867                        AC_SUBST(ac_sdl_ldflags) 
     868                        ac_sdl_cflags=`$SDL_CONFIG --cflags` 
     869                        ac_sdl_cflags="-DPJMEDIA_VIDEO_DEV_HAS_SDL=1 $ac_sdl_cflags" 
     870                        ac_sdl_ldflags=`$SDL_CONFIG --libs` 
     871                        LIBS="$LIBS $ac_sdl_ldflags" 
     872                  else 
    870873                        AC_MSG_RESULT([Unsupported SDL version]) 
    871                    fi 
     874                  fi 
    872875              ]) 
    873876 

  • pjproject/trunk/pjmedia/src/pjmedia-videodev/sdl_dev.c

    r4078 r4157  
    7777     0xFF0000, 0xFF00, 0xFF, 0} , 
    7878 
    79     {PJMEDIA_FORMAT_YUY2, SDL_YUY2_OVERLAY, 0, 0, 0, 0} , 
    80     {PJMEDIA_FORMAT_UYVY, SDL_UYVY_OVERLAY, 0, 0, 0, 0} , 
    81     {PJMEDIA_FORMAT_YVYU, SDL_YVYU_OVERLAY, 0, 0, 0, 0} , 
    82     {PJMEDIA_FORMAT_I420, SDL_IYUV_OVERLAY, 0, 0, 0, 0} , 
    83     {PJMEDIA_FORMAT_YV12, SDL_YV12_OVERLAY, 0, 0, 0, 0} , 
    84     {PJMEDIA_FORMAT_I420JPEG, SDL_IYUV_OVERLAY, 0, 0, 0, 0} , 
    85     {PJMEDIA_FORMAT_I422JPEG, SDL_YV12_OVERLAY, 0, 0, 0, 0} , 
     79    {PJMEDIA_FORMAT_YUY2, SDL_PIXELFORMAT_YUY2, 0, 0, 0, 0} , 
     80    {PJMEDIA_FORMAT_UYVY, SDL_PIXELFORMAT_UYVY, 0, 0, 0, 0} , 
     81    {PJMEDIA_FORMAT_YVYU, SDL_PIXELFORMAT_YVYU, 0, 0, 0, 0} , 
     82    {PJMEDIA_FORMAT_I420, SDL_PIXELFORMAT_IYUV, 0, 0, 0, 0} , 
     83    {PJMEDIA_FORMAT_YV12, SDL_PIXELFORMAT_YV12, 0, 0, 0, 0} , 
     84    {PJMEDIA_FORMAT_I420JPEG, SDL_PIXELFORMAT_IYUV, 0, 0, 0, 0} , 
     85    {PJMEDIA_FORMAT_I422JPEG, SDL_PIXELFORMAT_YV12, 0, 0, 0, 0} 
    8686}; 
    8787 
    … …  
    14191419 
    14201420#ifdef _MSC_VER 
    1421 #   pragma comment( lib, "sdl.lib") 
     1421#   if SDL_VERSION_ATLEAST(2,0,0) 
     1422#       pragma comment( lib, "sdl2.lib") 
     1423#   elif SDL_VERSION_ATLEAST(1,3,0) 
     1424#       pragma comment( lib, "sdl.lib") 
     1425#   endif 
    14221426#   if PJMEDIA_VIDEO_DEV_SDL_HAS_OPENGL 
    14231427#       pragma comment(lib, "OpenGL32.lib") 
Note: See TracChangeset for help on using the changeset viewer.