comparison configure @ 21095:a9dccda1eef4

Remove --with-x264libdir.

21094:85e28925e490

multiple paths separated by ':'):
  --extra-libs=FLAGS          extra linker flags
  --with-extraincdir=DIR      extra header search paths in DIR (*)
  --with-extralibdir=DIR      extra linker search paths in DIR (*)
  --with-x11libdir=DIR        X library files in DIR (*)
  --with-x264libdir=DIR       libx264 in DIR
  --with-livelibdir=DIR       LIVE555 Streaming Media in DIR
  --with-xmmsplugindir=DIR    XMMS plugins in DIR
  --with-xmmslibdir=DIR       libxmms.so.1 in DIR
  --with-xvmclib=NAME         adapter-specific library name (e.g. XvMCNVIDIA)

    _ld_x11=-L`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -L,g'`
    ;;
  --with-xvmclib=*)
    _xvmclib=`echo $ac_option | cut -d '=' -f 2`
    ;;
  --with-x264libdir=*)
    _ld_x264=-L`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -L,g'`
    ;;
  --with-sdl-config=*)
    _sdlconfig=`echo $ac_option | cut -d '=' -f 2`
    ;;
  --with-freetype-config=*)
    _freetypeconfig=`echo $ac_option | cut -d '=' -f 2`

#if X264_BUILD < 53
#error We do not support old versions of x264. Get the latest from SVN.
#endif
int main(void) { x264_encoder_open((void*)0); return 0; }
EOF
  _ld_x264="$_ld_x264 -lx264 $_ld_pthread"
  _x264=no
  if cc_check $_ld_x264 $_ld_lm ; then 
    _x264=yes
  elif  test "$_x11" = yes && cc_check $_ld_x264 $_ld_x11 $_ld_lm ; then
    _x264=yes
    _ld_x264="$_ld_x264 $_ld_x11"
  fi
fi

if test "$_x264" = yes ; then
  _x264=yes
  _def_x264='#define HAVE_X264 1'

    _lavc_x264=no
    _def_lavc_x264='#undef CONFIG_X264'
  fi
else
  _x264=no
  _ld_x264=''
  _lavc_x264=no
  _def_x264='#undef HAVE_X264'
  _def_lavc_x264='#undef CONFIG_X264'
  _nocodecmodules="x264 $_nocodecmodules"
fi

21095:a9dccda1eef4

multiple paths separated by ':'):
  --extra-libs=FLAGS          extra linker flags
  --with-extraincdir=DIR      extra header search paths in DIR (*)
  --with-extralibdir=DIR      extra linker search paths in DIR (*)
  --with-x11libdir=DIR        X library files in DIR (*)
  --with-livelibdir=DIR       LIVE555 Streaming Media in DIR
  --with-xmmsplugindir=DIR    XMMS plugins in DIR
  --with-xmmslibdir=DIR       libxmms.so.1 in DIR
  --with-xvmclib=NAME         adapter-specific library name (e.g. XvMCNVIDIA)

    _ld_x11=-L`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -L,g'`
    ;;
  --with-xvmclib=*)
    _xvmclib=`echo $ac_option | cut -d '=' -f 2`
    ;;
  --with-sdl-config=*)
    _sdlconfig=`echo $ac_option | cut -d '=' -f 2`
    ;;
  --with-freetype-config=*)
    _freetypeconfig=`echo $ac_option | cut -d '=' -f 2`

#if X264_BUILD < 53
#error We do not support old versions of x264. Get the latest from SVN.
#endif
int main(void) { x264_encoder_open((void*)0); return 0; }
EOF
  _x264=no
  for _ld_tmp in "-lx264 $_ld_pthread" "-lx264 $_ld_pthread $_ld_x11 $_ld_lm" ; do
    cc_check $_ld_tmp && _ld_x264="$_ld_tmp" && _x264=yes && break
  done
fi

if test "$_x264" = yes ; then
  _x264=yes
  _def_x264='#define HAVE_X264 1'

    _lavc_x264=no
    _def_lavc_x264='#undef CONFIG_X264'
  fi
else
  _x264=no
  _lavc_x264=no
  _def_x264='#undef HAVE_X264'
  _def_lavc_x264='#undef CONFIG_X264'
  _nocodecmodules="x264 $_nocodecmodules"
fi