Changeset 2448


Ignore:
Timestamp:
Aug 29, 2011 8:29:59 PM (9 years ago)
Author:
ldelgass
Message:

Added AC_CHECK_FUNCS for newer avformat_alloc_context and reran autoheader to
get the define used to select which function to use since AC_CHECK_LIB only
produces the define for presence of the library. Prevents a deprecation
warning when building nanovis against a newer ffmpeg.

Location:
trunk/packages/vizservers
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/packages/vizservers/configure

    r2439 r2448  
    643643VERSION
    644644TCL_VERSION
    645 TCL_LD_SEARCH_FLAGS
    646645TCL_LIB_SPEC
    647646TCL_INC_SPEC
     
    1280512804
    1280612805
     12806for ac_func in avformat_alloc_context
     12807do
     12808as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
     12809{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
     12810$as_echo_n "checking for $ac_func... " >&6; }
     12811if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
     12812  $as_echo_n "(cached) " >&6
     12813else
     12814  cat >conftest.$ac_ext <<_ACEOF
     12815/* confdefs.h.  */
     12816_ACEOF
     12817cat confdefs.h >>conftest.$ac_ext
     12818cat >>conftest.$ac_ext <<_ACEOF
     12819/* end confdefs.h.  */
     12820/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
     12821   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
     12822#define $ac_func innocuous_$ac_func
     12823
     12824/* System header to define __stub macros and hopefully few prototypes,
     12825    which can conflict with char $ac_func (); below.
     12826    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
     12827    <limits.h> exists even on freestanding compilers.  */
     12828
     12829#ifdef __STDC__
     12830# include <limits.h>
     12831#else
     12832# include <assert.h>
     12833#endif
     12834
     12835#undef $ac_func
     12836
     12837/* Override any GCC internal prototype to avoid an error.
     12838   Use char because int might match the return type of a GCC
     12839   builtin and then its argument prototype would still apply.  */
     12840#ifdef __cplusplus
     12841extern "C"
     12842#endif
     12843char $ac_func ();
     12844/* The GNU C library defines this for functions which it implements
     12845    to always fail with ENOSYS.  Some functions are actually named
     12846    something starting with __ and the normal name is an alias.  */
     12847#if defined __stub_$ac_func || defined __stub___$ac_func
     12848choke me
     12849#endif
     12850
     12851int
     12852main ()
     12853{
     12854return $ac_func ();
     12855  ;
     12856  return 0;
     12857}
     12858_ACEOF
     12859rm -f conftest.$ac_objext conftest$ac_exeext
     12860if { (ac_try="$ac_link"
     12861case "(($ac_try" in
     12862  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
     12863  *) ac_try_echo=$ac_try;;
     12864esac
     12865eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
     12866$as_echo "$ac_try_echo") >&5
     12867  (eval "$ac_link") 2>conftest.er1
     12868  ac_status=$?
     12869  grep -v '^ *+' conftest.er1 >conftest.err
     12870  rm -f conftest.er1
     12871  cat conftest.err >&5
     12872  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
     12873  (exit $ac_status); } && {
     12874         test -z "$ac_cxx_werror_flag" ||
     12875         test ! -s conftest.err
     12876       } && test -s conftest$ac_exeext && {
     12877         test "$cross_compiling" = yes ||
     12878         $as_test_x conftest$ac_exeext
     12879       }; then
     12880  eval "$as_ac_var=yes"
     12881else
     12882  $as_echo "$as_me: failed program was:" >&5
     12883sed 's/^/| /' conftest.$ac_ext >&5
     12884
     12885        eval "$as_ac_var=no"
     12886fi
     12887
     12888rm -rf conftest.dSYM
     12889rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
     12890      conftest$ac_exeext conftest.$ac_ext
     12891fi
     12892ac_res=`eval 'as_val=${'$as_ac_var'}
     12893                 $as_echo "$as_val"'`
     12894               { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
     12895$as_echo "$ac_res" >&6; }
     12896as_val=`eval 'as_val=${'$as_ac_var'}
     12897                 $as_echo "$as_val"'`
     12898   if test "x$as_val" = x""yes; then
     12899  cat >>confdefs.h <<_ACEOF
     12900#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
     12901_ACEOF
     12902
     12903fi
     12904done
     12905
     12906
    1280712907{ $as_echo "$as_me:$LINENO: checking for av_free in -lavutil" >&5
    1280812908$as_echo_n "checking for av_free in -lavutil... " >&6; }
     
    1316613266
    1316713267SUBDIRS="nanoscale nanovis pymolproxy vtkvis"
    13168 
    1316913268
    1317013269
  • trunk/packages/vizservers/configure.in

    r2447 r2448  
    282282    AC_CHECK_LIB([avformat], [av_alloc_format_context], [],
    283283        [AC_MSG_WARN([libavformat not usable])]))
     284AC_CHECK_FUNCS([avformat_alloc_context])
    284285AC_CHECK_LIB([avutil], [av_free])
    285286AC_CHECK_FUNCS([img_convert])
  • trunk/packages/vizservers/nanoscale/config.h.in

    r2440 r2448  
    99/* Define to 1 if you have the <arpa/inet.h> header file. */
    1010#undef HAVE_ARPA_INET_H
     11
     12/* Define to 1 if you have the `avformat_alloc_context' function. */
     13#undef HAVE_AVFORMAT_ALLOC_CONTEXT
    1114
    1215/* Define to 1 if you have the <Cg/cgGL.h> header file. */
  • trunk/packages/vizservers/nanovis/nvconf.h.in

    r2440 r2448  
    99/* Define to 1 if you have the <arpa/inet.h> header file. */
    1010#undef HAVE_ARPA_INET_H
     11
     12/* Define to 1 if you have the `avformat_alloc_context' function. */
     13#undef HAVE_AVFORMAT_ALLOC_CONTEXT
    1114
    1215/* Define to 1 if you have the <Cg/cgGL.h> header file. */
Note: See TracChangeset for help on using the changeset viewer.