Ignore:
Timestamp:
Dec 22, 2014, 7:18:59 AM (5 years ago)
Author:
ldelgass
Message:

Merge serveral changes from trunk. Does not include threading, world space
changes, etc.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • nanovis/branches/1.1/configure

    r4600 r4904  
    635635CG_INC_SPEC
    636636FFMPEG
     637AVCONV
    637638EGREP
    638639GREP
     
    699700with_rappture
    700701with_ffmpeg
     702with_avconv
    701703with_statsdir
    702704'
     
    13271329                          include/rappture.h [default=/usr]
    13281330  --with-ffmpeg=DIR       location of ffmpeg [default=yes]
     1331  --with-avconv=DIR       location of avconv [default=yes]
    13291332  --with-statsdir=DIR     Write statistics in DIR
    13301333
     
    22602263
    22612264
     2265# Check whether --with-avconv was given.
     2266if test "${with_avconv+set}" = set; then :
     2267  withval=$with_avconv;
     2268else
     2269  with_avconv=yes
     2270fi
     2271
     2272
     2273
    22622274# Check whether --with-statsdir was given.
    22632275if test "${with_statsdir+set}" = set; then :
     
    47224734
    47234735#--------------------------------------------------------------------
     4736# search for avconv executable
     4737#--------------------------------------------------------------------
     4738if test "${with_avconv}" != "no" ; then
     4739  if test "${with_avconv}" = "yes" ; then
     4740    # Extract the first word of "avconv", so it can be a program name with args.
     4741set dummy avconv; ac_word=$2
     4742{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
     4743$as_echo_n "checking for $ac_word... " >&6; }
     4744if ${ac_cv_path_AVCONV+:} false; then :
     4745  $as_echo_n "(cached) " >&6
     4746else
     4747  case $AVCONV in
     4748  [\\/]* | ?:[\\/]*)
     4749  ac_cv_path_AVCONV="$AVCONV" # Let the user override the test with a path.
     4750  ;;
     4751  *)
     4752  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
     4753for as_dir in $PATH
     4754do
     4755  IFS=$as_save_IFS
     4756  test -z "$as_dir" && as_dir=.
     4757    for ac_exec_ext in '' $ac_executable_extensions; do
     4758  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     4759    ac_cv_path_AVCONV="$as_dir/$ac_word$ac_exec_ext"
     4760    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     4761    break 2
     4762  fi
     4763done
     4764  done
     4765IFS=$as_save_IFS
     4766
     4767  ;;
     4768esac
     4769fi
     4770AVCONV=$ac_cv_path_AVCONV
     4771if test -n "$AVCONV"; then
     4772  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AVCONV" >&5
     4773$as_echo "$AVCONV" >&6; }
     4774else
     4775  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
     4776$as_echo "no" >&6; }
     4777fi
     4778
     4779
     4780  else
     4781    # Extract the first word of "avconv", so it can be a program name with args.
     4782set dummy avconv; ac_word=$2
     4783{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
     4784$as_echo_n "checking for $ac_word... " >&6; }
     4785if ${ac_cv_path_AVCONV+:} false; then :
     4786  $as_echo_n "(cached) " >&6
     4787else
     4788  case $AVCONV in
     4789  [\\/]* | ?:[\\/]*)
     4790  ac_cv_path_AVCONV="$AVCONV" # Let the user override the test with a path.
     4791  ;;
     4792  *)
     4793  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
     4794as_dummy="${with_avconv}/bin:${with_avconv}"
     4795for as_dir in $as_dummy
     4796do
     4797  IFS=$as_save_IFS
     4798  test -z "$as_dir" && as_dir=.
     4799    for ac_exec_ext in '' $ac_executable_extensions; do
     4800  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     4801    ac_cv_path_AVCONV="$as_dir/$ac_word$ac_exec_ext"
     4802    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     4803    break 2
     4804  fi
     4805done
     4806  done
     4807IFS=$as_save_IFS
     4808
     4809  ;;
     4810esac
     4811fi
     4812AVCONV=$ac_cv_path_AVCONV
     4813if test -n "$AVCONV"; then
     4814  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AVCONV" >&5
     4815$as_echo "$AVCONV" >&6; }
     4816else
     4817  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
     4818$as_echo "no" >&6; }
     4819fi
     4820
     4821
     4822  fi
     4823  if test "${AVCONV}x" != "x" ; then
     4824
     4825$as_echo "#define HAVE_AVCONV 1" >>confdefs.h
     4826
     4827  fi
     4828fi
     4829
     4830#--------------------------------------------------------------------
    47244831# search for ffmpeg executable
    47254832#--------------------------------------------------------------------
     
    48764983  LD_RPATH="$loader_run_path:${CG_LIB_DIR}"
    48774984fi
     4985
    48784986
    48794987
Note: See TracChangeset for help on using the changeset viewer.