Changeset 4881 for pjproject


Ignore:
Timestamp:
Jul 22, 2014 7:44:53 AM (10 years ago)
Author:
bennylp
Message:

Re #1757, re #1758: fix configure script. Now OpenGL renderer is enabled by default by the configure script. And added missing dependency to -lstdc++ for the openh274 library

Location:
pjproject/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • pjproject/trunk/aconfigure

    r4875 r4881  
    11#! /bin/sh 
    22# Guess values for system-dependent variables and create Makefiles. 
    3 # Generated by GNU Autoconf 2.68 for pjproject 2.x. 
     3# Generated by GNU Autoconf 2.69 for pjproject 2.x. 
    44# 
    55# 
    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. 
     6# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. 
    97# 
    108# 
    … …  
    135133(unset CDPATH) >/dev/null 2>&1 && unset CDPATH 
    136134 
     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. 
     143BASH_ENV=/dev/null 
     144ENV=/dev/null 
     145(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV 
     146case $- in # (((( 
     147  *v*x* | *x*v* ) as_opts=-vx ;; 
     148  *v* ) as_opts=-v ;; 
     149  *x* ) as_opts=-x ;; 
     150  * ) as_opts= ;; 
     151esac 
     152exec $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 
     156as_fn_exit 255 
     157  fi 
     158  # We don't want this to propagate to other subprocesses. 
     159          { _as_can_reexec=; unset _as_can_reexec;} 
    137160if test "x$CONFIG_SHELL" = x; then 
    138161  as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : 
    … …  
    168191  exitcode=1; echo positional parameters were not saved. 
    169192fi 
    170 test x\$exitcode = x0 || exit 1" 
     193test x\$exitcode = x0 || exit 1 
     194test -x / || exit 1" 
    171195  as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO 
    172196  as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO 
    … …  
    213237 
    214238      if test "x$CONFIG_SHELL" != x; then : 
    215   # We cannot yet assume a decent shell, so we have to provide a 
    216         # neutralization value for shells without unset; and this also 
    217         # works around shells that cannot unset nonexistent variables. 
    218         # Preserve -v and -x to the replacement shell. 
    219         BASH_ENV=/dev/null 
    220         ENV=/dev/null 
    221         (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV 
    222         export CONFIG_SHELL 
    223         case $- in # (((( 
    224           *v*x* | *x*v* ) as_opts=-vx ;; 
    225           *v* ) as_opts=-v ;; 
    226           *x* ) as_opts=-x ;; 
    227           * ) as_opts= ;; 
    228         esac 
    229         exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"} 
     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. 
     244BASH_ENV=/dev/null 
     245ENV=/dev/null 
     246(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV 
     247case $- in # (((( 
     248  *v*x* | *x*v* ) as_opts=-vx ;; 
     249  *v* ) as_opts=-v ;; 
     250  *x* ) as_opts=-x ;; 
     251  * ) as_opts= ;; 
     252esac 
     253exec $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 
     257exit 255 
    230258fi 
    231259 
    … …  
    329357 
    330358} # as_fn_mkdir_p 
     359 
     360# as_fn_executable_p FILE 
     361# ----------------------- 
     362# Test if FILE is an executable regular file. 
     363as_fn_executable_p () 
     364{ 
     365  test -f "$1" && test -x "$1" 
     366} # as_fn_executable_p 
    331367# as_fn_append VAR VALUE 
    332368# ---------------------- 
    … …  
    450486    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } 
    451487 
     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 
    452492  # Don't try to exec as it changes $[0], causing all sort of problems 
    453493  # (the dirname of $[0] is not the place where we might find the 
    … …  
    484524    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. 
    485525    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. 
    486     # In both cases, we have to default to `cp -p'. 
     526    # In both cases, we have to default to `cp -pR'. 
    487527    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || 
    488       as_ln_s='cp -p' 
     528      as_ln_s='cp -pR' 
    489529  elif ln conf$$.file conf$$ 2>/dev/null; then 
    490530    as_ln_s=ln 
    491531  else 
    492     as_ln_s='cp -p' 
     532    as_ln_s='cp -pR' 
    493533  fi 
    494534else 
    495   as_ln_s='cp -p' 
     535  as_ln_s='cp -pR' 
    496536fi 
    497537rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file 
    … …  
    505545fi 
    506546 
    507 if test -x / >/dev/null 2>&1; then 
    508   as_test_x='test -x' 
    509 else 
    510   if ls -dL / >/dev/null 2>&1; then 
    511     as_ls_L_option=L 
    512   else 
    513     as_ls_L_option= 
    514   fi 
    515   as_test_x=' 
    516     eval sh -c '\'' 
    517       if test -d "$1"; then 
    518         test -d "$1/."; 
    519       else 
    520         case $1 in #( 
    521         -*)set "./$1";; 
    522         esac; 
    523         case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( 
    524         ???[sx]*):;;*)false;;esac;fi 
    525     '\'' sh 
    526   ' 
    527 fi 
    528 as_executable_p=$as_test_x 
     547as_test_x='test -x' 
     548as_executable_p=as_fn_executable_p 
    529549 
    530550# Sed expression to map a string onto a valid CPP name. 
    … …  
    12591279  if test "x$build_alias" = x; then 
    12601280    cross_compiling=maybe 
    1261     $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. 
    1262     If a cross compiler is detected then cross compile mode will be used" >&2 
    12631281  elif test "x$build_alias" != "x$host_alias"; then 
    12641282    cross_compiling=yes 
    … …  
    15781596  cat <<\_ACEOF 
    15791597pjproject configure 2.x 
    1580 generated by GNU Autoconf 2.68 
    1581  
    1582 Copyright (C) 2010 Free Software Foundation, Inc. 
     1598generated by GNU Autoconf 2.69 
     1599 
     1600Copyright (C) 2012 Free Software Foundation, Inc. 
    15831601This configure script is free software; the Free Software Foundation 
    15841602gives unlimited permission to copy, distribute and modify it. 
    … …  
    16941712       } && test -s conftest$ac_exeext && { 
    16951713         test "$cross_compiling" = yes || 
    1696          $as_test_x conftest$ac_exeext 
     1714         test -x conftest$ac_exeext 
    16971715       }; then : 
    16981716  ac_retval=0 
    … …  
    19811999 
    19822000It was created by pjproject $as_me 2.x, which was 
    1983 generated by GNU Autoconf 2.68.  Invocation command line was 
     2001generated by GNU Autoconf 2.69.  Invocation command line was 
    19842002 
    19852003  $ $0 $@ 
    … …  
    25062524  test -z "$as_dir" && as_dir=. 
    25072525    for ac_exec_ext in '' $ac_executable_extensions; do 
    2508   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 
     2526  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 
    25092527    ac_cv_prog_CC="${ac_tool_prefix}gcc" 
    25102528    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 
    … …  
    25462564  test -z "$as_dir" && as_dir=. 
    25472565    for ac_exec_ext in '' $ac_executable_extensions; do 
    2548   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 
     2566  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 
    25492567    ac_cv_prog_ac_ct_CC="gcc" 
    25502568    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 
    … …  
    25992617  test -z "$as_dir" && as_dir=. 
    26002618    for ac_exec_ext in '' $ac_executable_extensions; do 
    2601   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 
     2619  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 
    26022620    ac_cv_prog_CC="${ac_tool_prefix}cc" 
    26032621    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 
    … …  
    26402658  test -z "$as_dir" && as_dir=. 
    26412659    for ac_exec_ext in '' $ac_executable_extensions; do 
    2642   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 
     2660  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 
    26432661    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then 
    26442662       ac_prog_rejected=yes 
    … …  
    26982716  test -z "$as_dir" && as_dir=. 
    26992717    for ac_exec_ext in '' $ac_executable_extensions; do 
    2700   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 
     2718  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 
    27012719    ac_cv_prog_CC="$ac_tool_prefix$ac_prog" 
    27022720    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 
    … …  
    27422760  test -z "$as_dir" && as_dir=. 
    27432761    for ac_exec_ext in '' $ac_executable_extensions; do 
    2744   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 
     2762  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 
    27452763    ac_cv_prog_ac_ct_CC="$ac_prog" 
    27462764    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 
    … …  
    31883206#include <stdarg.h> 
    31893207#include <stdio.h> 
    3190 #include <sys/types.h> 
    3191 #include <sys/stat.h> 
     3208struct stat; 
    31923209/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */ 
    31933210struct buf { int x; }; 
    … …  
    33023319  test -z "$as_dir" && as_dir=. 
    33033320    for ac_exec_ext in '' $ac_executable_extensions; do 
    3304   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 
     3321  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 
    33053322    ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" 
    33063323    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 
    … …  
    33463363  test -z "$as_dir" && as_dir=. 
    33473364    for ac_exec_ext in '' $ac_executable_extensions; do 
    3348   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 
     3365  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 
    33493366    ac_cv_prog_ac_ct_CXX="$ac_prog" 
    33503367    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 
    … …  
    35553572  test -z "$as_dir" && as_dir=. 
    35563573    for ac_exec_ext in '' $ac_executable_extensions; do 
    3557   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 
     3574  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 
    35583575    ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" 
    35593576    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 
    … …  
    35953612  test -z "$as_dir" && as_dir=. 
    35963613    for ac_exec_ext in '' $ac_executable_extensions; do 
    3597   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 
     3614  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 
    35983615    ac_cv_prog_ac_ct_RANLIB="ranlib" 
    35993616    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 
    … …  
    36493666  test -z "$as_dir" && as_dir=. 
    36503667    for ac_exec_ext in '' $ac_executable_extensions; do 
    3651   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 
     3668  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 
    36523669    ac_cv_prog_AR="$ac_tool_prefix$ac_prog" 
    36533670    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 
    … …  
    36933710  test -z "$as_dir" && as_dir=. 
    36943711    for ac_exec_ext in '' $ac_executable_extensions; do 
    3695   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 
     3712  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 
    36963713    ac_cv_prog_ac_ct_AR="$ac_prog" 
    36973714    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 
    … …  
    44754492    for ac_exec_ext in '' $ac_executable_extensions; do 
    44764493      ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" 
    4477       { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue 
     4494      as_fn_executable_p "$ac_path_GREP" || continue 
    44784495# Check for GNU ac_path_GREP and select it if it is found. 
    44794496  # Check for GNU $ac_path_GREP 
    … …  
    45414558    for ac_exec_ext in '' $ac_executable_extensions; do 
    45424559      ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" 
    4543       { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue 
     4560      as_fn_executable_p "$ac_path_EGREP" || continue 
    45444561# Check for GNU ac_path_EGREP and select it if it is found. 
    45454562  # Check for GNU $ac_path_EGREP 
    … …  
    61696186        LIBS="$SAVED_LIBS" 
    61706187        if test "$ac_pjmedia_video_has_ios" = "yes"; then 
    6171           ac_ios_cflags="-DPJMEDIA_VIDEO_DEV_HAS_IOS=1" 
    6172           LIBS="$LIBS -framework AVFoundation -framework CoreGraphics -framework QuartzCore -framework CoreVideo -framework CoreMedia" 
     6188          ac_ios_cflags="-DPJMEDIA_VIDEO_DEV_HAS_IOS=1 -DPJMEDIA_VIDEO_DEV_HAS_IOS_OPENGL=1" 
     6189          LIBS="$LIBS -framework OpenGLES -framework AVFoundation -framework CoreGraphics -framework QuartzCore -framework CoreVideo -framework CoreMedia" 
    61736190          { $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking if AVFoundation framework is available... yes" >&5 
    61746191$as_echo "Checking if AVFoundation framework is available... yes" >&6; } 
    … …  
    65086525  test -z "$as_dir" && as_dir=. 
    65096526    for ac_exec_ext in '' $ac_executable_extensions; do 
    6510   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 
     6527  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 
    65116528    ac_cv_path_SDL_CONFIG="$as_dir/$ac_word$ac_exec_ext" 
    65126529    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 
    … …  
    65546571  test -z "$as_dir" && as_dir=. 
    65556572    for ac_exec_ext in '' $ac_executable_extensions; do 
    6556   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 
     6573  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 
    65576574    ac_cv_path_SDL_CONFIG="$as_dir/$ac_word$ac_exec_ext" 
    65586575    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 
    … …  
    66596676  test -z "$as_dir" && as_dir=. 
    66606677    for ac_exec_ext in '' $ac_executable_extensions; do 
    6661   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 
     6678  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 
    66626679    ac_cv_prog_PKG_CONFIG="$ac_prog" 
    66636680    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 
    … …  
    71097126 
    71107127                  LIBS="$OPENH264_LIBS $LIBS" 
    7111                   LDFLAGS="$OPENH264_LDFLAGS $LDFLAGS" 
     7128                  LDFLAGS="$OPENH264_LDFLAGS $LDFLAGS -lstdc++" 
    71127129                  CFLAGS="$OPENH264_CFLAGS $CFLAGS" 
    71137130 
    … …  
    85458562    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. 
    85468563    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. 
    8547     # In both cases, we have to default to `cp -p'. 
     8564    # In both cases, we have to default to `cp -pR'. 
    85488565    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || 
    8549       as_ln_s='cp -p' 
     8566      as_ln_s='cp -pR' 
    85508567  elif ln conf$$.file conf$$ 2>/dev/null; then 
    85518568    as_ln_s=ln 
    85528569  else 
    8553     as_ln_s='cp -p' 
     8570    as_ln_s='cp -pR' 
    85548571  fi 
    85558572else 
    8556   as_ln_s='cp -p' 
     8573  as_ln_s='cp -pR' 
    85578574fi 
    85588575rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file 
    … …  
    86148631fi 
    86158632 
    8616 if test -x / >/dev/null 2>&1; then 
    8617   as_test_x='test -x' 
    8618 else 
    8619   if ls -dL / >/dev/null 2>&1; then 
    8620     as_ls_L_option=L 
    8621   else 
    8622     as_ls_L_option= 
    8623   fi 
    8624   as_test_x=' 
    8625     eval sh -c '\'' 
    8626       if test -d "$1"; then 
    8627         test -d "$1/."; 
    8628       else 
    8629         case $1 in #( 
    8630         -*)set "./$1";; 
    8631         esac; 
    8632         case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( 
    8633         ???[sx]*):;;*)false;;esac;fi 
    8634     '\'' sh 
    8635   ' 
    8636 fi 
    8637 as_executable_p=$as_test_x 
     8633 
     8634# as_fn_executable_p FILE 
     8635# ----------------------- 
     8636# Test if FILE is an executable regular file. 
     8637as_fn_executable_p () 
     8638{ 
     8639  test -f "$1" && test -x "$1" 
     8640} # as_fn_executable_p 
     8641as_test_x='test -x' 
     8642as_executable_p=as_fn_executable_p 
    86388643 
    86398644# Sed expression to map a string onto a valid CPP name. 
    … …  
    86578662ac_log=" 
    86588663This file was extended by pjproject $as_me 2.x, which was 
    8659 generated by GNU Autoconf 2.68.  Invocation command line was 
     8664generated by GNU Autoconf 2.69.  Invocation command line was 
    86608665 
    86618666  CONFIG_FILES    = $CONFIG_FILES 
    … …  
    87198724ac_cs_version="\\ 
    87208725pjproject config.status 2.x 
    8721 configured by $0, generated by GNU Autoconf 2.68, 
     8726configured by $0, generated by GNU Autoconf 2.69, 
    87228727  with options \\"\$ac_cs_config\\" 
    87238728 
    8724 Copyright (C) 2010 Free Software Foundation, Inc. 
     8729Copyright (C) 2012 Free Software Foundation, Inc. 
    87258730This config.status script is free software; the Free Software Foundation 
    87268731gives unlimited permission to copy, distribute and modify it." 
    … …  
    88108815cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 
    88118816if \$ac_cs_recheck; then 
    8812   set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion 
     8817  set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion 
    88138818  shift 
    88148819  \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 

  • pjproject/trunk/aconfigure.ac

    r4875 r4881  
    715715        LIBS="$SAVED_LIBS" 
    716716        if test "$ac_pjmedia_video_has_ios" = "yes"; then 
    717           ac_ios_cflags="-DPJMEDIA_VIDEO_DEV_HAS_IOS=1" 
    718           LIBS="$LIBS -framework AVFoundation -framework CoreGraphics -framework QuartzCore -framework CoreVideo -framework CoreMedia" 
     717          ac_ios_cflags="-DPJMEDIA_VIDEO_DEV_HAS_IOS=1 -DPJMEDIA_VIDEO_DEV_HAS_IOS_OPENGL=1" 
     718          LIBS="$LIBS -framework OpenGLES -framework AVFoundation -framework CoreGraphics -framework QuartzCore -framework CoreVideo -framework CoreMedia" 
    719719          AC_MSG_RESULT([Checking if AVFoundation framework is available... yes]) 
    720720        else 
    … …  
    11401140                   
    11411141                  LIBS="$OPENH264_LIBS $LIBS" 
    1142                   LDFLAGS="$OPENH264_LDFLAGS $LDFLAGS" 
     1142                  LDFLAGS="$OPENH264_LDFLAGS $LDFLAGS -lstdc++" 
    11431143                  CFLAGS="$OPENH264_CFLAGS $CFLAGS" 
    11441144                   
Note: See TracChangeset for help on using the changeset viewer.