[Asterisk-code-review] chan_oss: Remove libs of (12 year old) Video Console. (asterisk[master])
Alexander Traud
asteriskteam at digium.com
Wed Apr 15 08:30:51 CDT 2020
Alexander Traud has uploaded this change for review. ( https://gerrit.asterisk.org/c/asterisk/+/14216 )
Change subject: chan_oss: Remove libs of (12 year old) Video Console.
......................................................................
chan_oss: Remove libs of (12 year old) Video Console.
ASTERISK-28836
Change-Id: I2c64c85ad07bb8bfb97aa5a9876f9e818955210c
---
M configure
M configure.ac
M makeopts.in
3 files changed, 2 insertions(+), 711 deletions(-)
git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/16/14216/1
diff --git a/configure b/configure
index aba5221..6037027 100755
--- a/configure
+++ b/configure
@@ -649,7 +649,6 @@
GTK2_LIBS
GTK2_CFLAGS
PBX_LAUNCHD
-CONFIG_SDL
PBX_SO_NOSIGPIPE
PBX_MSG_NOSIGNAL
PBX_IXJUSER
@@ -719,10 +718,6 @@
ZLIB_DIR
ZLIB_INCLUDE
ZLIB_LIB
-PBX_X11
-X11_DIR
-X11_INCLUDE
-X11_LIB
PBX_VPB
VPB_DIR
VPB_INCLUDE
@@ -815,14 +810,6 @@
SPANDSP_DIR
SPANDSP_INCLUDE
SPANDSP_LIB
-PBX_SDL_IMAGE
-SDL_IMAGE_DIR
-SDL_IMAGE_INCLUDE
-SDL_IMAGE_LIB
-PBX_SDL
-SDL_DIR
-SDL_INCLUDE
-SDL_LIB
PBX_SNDFILE
SNDFILE_DIR
SNDFILE_INCLUDE
@@ -1144,10 +1131,6 @@
GSM_DIR
GSM_INCLUDE
GSM_LIB
-PBX_FFMPEG
-FFMPEG_DIR
-FFMPEG_INCLUDE
-FFMPEG_LIB
PBX_DAHDI
DAHDI_DIR
DAHDI_INCLUDE
@@ -1388,7 +1371,6 @@
with_crypt
with_crypto
with_dahdi
-with_avcodec
with_gsm
with_ilbc
with_gtk2
@@ -1434,8 +1416,6 @@
with_fftw3
with_resample
with_sndfile
-with_sdl
-with_SDL_image
with_spandsp
with_ss7
with_speex
@@ -1452,7 +1432,6 @@
with_unixodbc
with_vorbis
with_vpb
-with_x11
with_z
enable_xmldoc
enable_permanent_dlopen
@@ -2147,7 +2126,6 @@
--with-crypt=PATH use password and data encryption files in PATH
--with-crypto=PATH use OpenSSL Cryptography files in PATH
--with-dahdi=PATH use DAHDI files in PATH
- --with-avcodec=PATH use Ffmpeg and avcodec files in PATH
--with-gsm=PATH use External GSM files in PATH, use 'internal' GSM
otherwise
--with-ilbc=PATH use System iLBC files in PATH, use 'internal' iLBC
@@ -2196,8 +2174,6 @@
--with-fftw3=PATH use LIBFFTW3 files in PATH
--with-resample=PATH use LIBRESAMPLE files in PATH
--with-sndfile=PATH use libsndfile files in PATH
- --with-sdl=PATH use Sdl files in PATH
- --with-SDL_image=PATH use Sdl Image files in PATH
--with-spandsp=PATH use SPANDSP files in PATH
--with-ss7=PATH use ISDN SS7 files in PATH
--with-speex=PATH use Speex files in PATH
@@ -2215,7 +2191,6 @@
--with-unixodbc=PATH use unixODBC files in PATH
--with-vorbis=PATH use Vorbis files in PATH
--with-vpb=PATH use Voicetronix API files in PATH
- --with-x11=PATH use X11 files in PATH
--with-z=PATH use zlib compression files in PATH
Some influential environment variables:
@@ -9718,38 +9693,6 @@
- FFMPEG_DESCRIP="Ffmpeg and avcodec"
- FFMPEG_OPTION="avcodec"
- PBX_FFMPEG=0
-
-# Check whether --with-avcodec was given.
-if test "${with_avcodec+set}" = set; then :
- withval=$with_avcodec;
- case ${withval} in
- n|no)
- USE_FFMPEG=no
- # -1 is a magic value used by menuselect to know that the package
- # was disabled, other than 'not found'
- PBX_FFMPEG=-1
- ;;
- y|ye|yes)
- ac_mandatory_list="${ac_mandatory_list} FFMPEG"
- ;;
- *)
- FFMPEG_DIR="${withval}"
- ac_mandatory_list="${ac_mandatory_list} FFMPEG"
- ;;
- esac
-
-fi
-
-
-
-
-
-
-
-
GSM_DESCRIP="External GSM"
GSM_OPTION="gsm"
PBX_GSM=0
@@ -11997,70 +11940,6 @@
- SDL_DESCRIP="Sdl"
- SDL_OPTION="sdl"
- PBX_SDL=0
-
-# Check whether --with-sdl was given.
-if test "${with_sdl+set}" = set; then :
- withval=$with_sdl;
- case ${withval} in
- n|no)
- USE_SDL=no
- # -1 is a magic value used by menuselect to know that the package
- # was disabled, other than 'not found'
- PBX_SDL=-1
- ;;
- y|ye|yes)
- ac_mandatory_list="${ac_mandatory_list} SDL"
- ;;
- *)
- SDL_DIR="${withval}"
- ac_mandatory_list="${ac_mandatory_list} SDL"
- ;;
- esac
-
-fi
-
-
-
-
-
-
-
-
- SDL_IMAGE_DESCRIP="Sdl Image"
- SDL_IMAGE_OPTION="SDL_image"
- PBX_SDL_IMAGE=0
-
-# Check whether --with-SDL_image was given.
-if test "${with_SDL_image+set}" = set; then :
- withval=$with_SDL_image;
- case ${withval} in
- n|no)
- USE_SDL_IMAGE=no
- # -1 is a magic value used by menuselect to know that the package
- # was disabled, other than 'not found'
- PBX_SDL_IMAGE=-1
- ;;
- y|ye|yes)
- ac_mandatory_list="${ac_mandatory_list} SDL_IMAGE"
- ;;
- *)
- SDL_IMAGE_DIR="${withval}"
- ac_mandatory_list="${ac_mandatory_list} SDL_IMAGE"
- ;;
- esac
-
-fi
-
-
-
-
-
-
-
-
SPANDSP_DESCRIP="SPANDSP"
SPANDSP_OPTION="spandsp"
PBX_SPANDSP=0
@@ -12688,38 +12567,6 @@
- X11_DESCRIP="X11"
- X11_OPTION="x11"
- PBX_X11=0
-
-# Check whether --with-x11 was given.
-if test "${with_x11+set}" = set; then :
- withval=$with_x11;
- case ${withval} in
- n|no)
- USE_X11=no
- # -1 is a magic value used by menuselect to know that the package
- # was disabled, other than 'not found'
- PBX_X11=-1
- ;;
- y|ye|yes)
- ac_mandatory_list="${ac_mandatory_list} X11"
- ;;
- *)
- X11_DIR="${withval}"
- ac_mandatory_list="${ac_mandatory_list} X11"
- ;;
- esac
-
-fi
-
-
-
-
-
-
-
-
ZLIB_DESCRIP="zlib compression"
ZLIB_OPTION="z"
PBX_ZLIB=0
@@ -33664,532 +33511,6 @@
-
- if test "x${PBX_SDL}" != "x1" -a "${USE_SDL}" != "no"; then
- PBX_SDL=0
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}sdl-config", so it can be a program name with args.
-set dummy ${ac_tool_prefix}sdl-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_CONFIG_SDL+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- case $CONFIG_SDL in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_CONFIG_SDL="$CONFIG_SDL" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-as_dummy="${SDL_DIR}/bin:$PATH"
-for as_dir in $as_dummy
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_path_CONFIG_SDL="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
- ;;
-esac
-fi
-CONFIG_SDL=$ac_cv_path_CONFIG_SDL
-if test -n "$CONFIG_SDL"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CONFIG_SDL" >&5
-$as_echo "$CONFIG_SDL" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_path_CONFIG_SDL"; then
- ac_pt_CONFIG_SDL=$CONFIG_SDL
- # Extract the first word of "sdl-config", so it can be a program name with args.
-set dummy sdl-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_ac_pt_CONFIG_SDL+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- case $ac_pt_CONFIG_SDL in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_ac_pt_CONFIG_SDL="$ac_pt_CONFIG_SDL" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-as_dummy="${SDL_DIR}/bin:$PATH"
-for as_dir in $as_dummy
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_path_ac_pt_CONFIG_SDL="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
- ;;
-esac
-fi
-ac_pt_CONFIG_SDL=$ac_cv_path_ac_pt_CONFIG_SDL
-if test -n "$ac_pt_CONFIG_SDL"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_CONFIG_SDL" >&5
-$as_echo "$ac_pt_CONFIG_SDL" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
- if test "x$ac_pt_CONFIG_SDL" = x; then
- CONFIG_SDL="No"
- else
- case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
- CONFIG_SDL=$ac_pt_CONFIG_SDL
- fi
-else
- CONFIG_SDL="$ac_cv_path_CONFIG_SDL"
-fi
-
- if test ! "x${CONFIG_SDL}" = xNo; then
- SDL_INCLUDE=$(${CONFIG_SDL} --cflags)
- SDL_INCLUDE=$(echo ${SDL_INCLUDE} | $SED -e "s|-I|-I${SDL_DIR}|g" -e "s|-std=c99||g")
-
- SDL_LIB=$(${CONFIG_SDL} --libs)
- SDL_LIB=$(echo ${SDL_LIB} | $SED -e "s|-L|-L${SDL_DIR}|g")
-
-
- PBX_SDL=1
-
-$as_echo "#define HAVE_SDL 1" >>confdefs.h
-
-
- fi
- fi
-
-
-if test "x${PBX_SDL_IMAGE}" != "x1" -a "${USE_SDL_IMAGE}" != "no"; then
- pbxlibdir=""
- # if --with-SDL_IMAGE=DIR has been specified, use it.
- if test "x${SDL_IMAGE_DIR}" != "x"; then
- if test -d ${SDL_IMAGE_DIR}/lib; then
- pbxlibdir="-L${SDL_IMAGE_DIR}/lib"
- else
- pbxlibdir="-L${SDL_IMAGE_DIR}"
- fi
- fi
-
- ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
- CFLAGS="${CFLAGS} ${SDL_INCLUDE}"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for IMG_Load in -lSDL_image" >&5
-$as_echo_n "checking for IMG_Load in -lSDL_image... " >&6; }
-if ${ac_cv_lib_SDL_image_IMG_Load+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lSDL_image ${pbxlibdir} ${SDL_LIB} $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char IMG_Load ();
-int
-main ()
-{
-return IMG_Load ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_SDL_image_IMG_Load=yes
-else
- ac_cv_lib_SDL_image_IMG_Load=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_SDL_image_IMG_Load" >&5
-$as_echo "$ac_cv_lib_SDL_image_IMG_Load" >&6; }
-if test "x$ac_cv_lib_SDL_image_IMG_Load" = xyes; then :
- AST_SDL_IMAGE_FOUND=yes
-else
- AST_SDL_IMAGE_FOUND=no
-fi
-
- CFLAGS="${ast_ext_lib_check_save_CFLAGS}"
-
-
- # now check for the header.
- if test "${AST_SDL_IMAGE_FOUND}" = "yes"; then
- SDL_IMAGE_LIB="${pbxlibdir} -lSDL_image ${SDL_LIB}"
- # if --with-SDL_IMAGE=DIR has been specified, use it.
- if test "x${SDL_IMAGE_DIR}" != "x"; then
- SDL_IMAGE_INCLUDE="-I${SDL_IMAGE_DIR}/include"
- fi
- SDL_IMAGE_INCLUDE="${SDL_IMAGE_INCLUDE} ${SDL_INCLUDE}"
-
- # check for the header
- ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
- CPPFLAGS="${CPPFLAGS} ${SDL_IMAGE_INCLUDE}"
- ac_fn_c_check_header_mongrel "$LINENO" "SDL_image.h" "ac_cv_header_SDL_image_h" "$ac_includes_default"
-if test "x$ac_cv_header_SDL_image_h" = xyes; then :
- SDL_IMAGE_HEADER_FOUND=1
-else
- SDL_IMAGE_HEADER_FOUND=0
-fi
-
-
- CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
-
- if test "x${SDL_IMAGE_HEADER_FOUND}" = "x0" ; then
- SDL_IMAGE_LIB=""
- SDL_IMAGE_INCLUDE=""
- else
-
- PBX_SDL_IMAGE=1
- cat >>confdefs.h <<_ACEOF
-#define HAVE_SDL_IMAGE 1
-_ACEOF
-
- fi
- fi
-fi
-
-
-
-if test "x${PBX_FFMPEG}" != "x1" -a "${USE_FFMPEG}" != "no"; then
- pbxlibdir=""
- # if --with-FFMPEG=DIR has been specified, use it.
- if test "x${FFMPEG_DIR}" != "x"; then
- if test -d ${FFMPEG_DIR}/lib; then
- pbxlibdir="-L${FFMPEG_DIR}/lib"
- else
- pbxlibdir="-L${FFMPEG_DIR}"
- fi
- fi
-
- ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
- CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sws_getContext in -lavcodec" >&5
-$as_echo_n "checking for sws_getContext in -lavcodec... " >&6; }
-if ${ac_cv_lib_avcodec_sws_getContext+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lavcodec ${pbxlibdir} ${PTHREAD_LIBS} -lz -lm $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char sws_getContext ();
-int
-main ()
-{
-return sws_getContext ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_avcodec_sws_getContext=yes
-else
- ac_cv_lib_avcodec_sws_getContext=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_avcodec_sws_getContext" >&5
-$as_echo "$ac_cv_lib_avcodec_sws_getContext" >&6; }
-if test "x$ac_cv_lib_avcodec_sws_getContext" = xyes; then :
- AST_FFMPEG_FOUND=yes
-else
- AST_FFMPEG_FOUND=no
-fi
-
- CFLAGS="${ast_ext_lib_check_save_CFLAGS}"
-
-
- # now check for the header.
- if test "${AST_FFMPEG_FOUND}" = "yes"; then
- FFMPEG_LIB="${pbxlibdir} -lavcodec ${PTHREAD_LIBS} -lz -lm"
- # if --with-FFMPEG=DIR has been specified, use it.
- if test "x${FFMPEG_DIR}" != "x"; then
- FFMPEG_INCLUDE="-I${FFMPEG_DIR}/include"
- fi
- FFMPEG_INCLUDE="${FFMPEG_INCLUDE} ${PTHREAD_CFLAGS}"
-
- # check for the header
- ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
- CPPFLAGS="${CPPFLAGS} ${FFMPEG_INCLUDE}"
- ac_fn_c_check_header_mongrel "$LINENO" "ffmpeg/avcodec.h" "ac_cv_header_ffmpeg_avcodec_h" "$ac_includes_default"
-if test "x$ac_cv_header_ffmpeg_avcodec_h" = xyes; then :
- FFMPEG_HEADER_FOUND=1
-else
- FFMPEG_HEADER_FOUND=0
-fi
-
-
- CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
-
- if test "x${FFMPEG_HEADER_FOUND}" = "x0" ; then
- FFMPEG_LIB=""
- FFMPEG_INCLUDE=""
- else
-
- PBX_FFMPEG=1
- cat >>confdefs.h <<_ACEOF
-#define HAVE_FFMPEG 1
-_ACEOF
-
- fi
- fi
-fi
-
-
-
-# possible places for video4linux version 1
-ac_fn_c_check_header_mongrel "$LINENO" "linux/videodev.h" "ac_cv_header_linux_videodev_h" "$ac_includes_default"
-if test "x$ac_cv_header_linux_videodev_h" = xyes; then :
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_VIDEODEV_H 1
-_ACEOF
-
-fi
-
-
-
-# possible places for X11
-
-if test "x${PBX_X11}" != "x1" -a "${USE_X11}" != "no"; then
- pbxlibdir=""
- # if --with-X11=DIR has been specified, use it.
- if test "x${X11_DIR}" != "x"; then
- if test -d ${X11_DIR}/lib; then
- pbxlibdir="-L${X11_DIR}/lib"
- else
- pbxlibdir="-L${X11_DIR}"
- fi
- fi
-
- ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
- CFLAGS="${CFLAGS} "
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XOpenDisplay in -lX11" >&5
-$as_echo_n "checking for XOpenDisplay in -lX11... " >&6; }
-if ${ac_cv_lib_X11_XOpenDisplay+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lX11 ${pbxlibdir} $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char XOpenDisplay ();
-int
-main ()
-{
-return XOpenDisplay ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_X11_XOpenDisplay=yes
-else
- ac_cv_lib_X11_XOpenDisplay=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_X11_XOpenDisplay" >&5
-$as_echo "$ac_cv_lib_X11_XOpenDisplay" >&6; }
-if test "x$ac_cv_lib_X11_XOpenDisplay" = xyes; then :
- AST_X11_FOUND=yes
-else
- AST_X11_FOUND=no
-fi
-
- CFLAGS="${ast_ext_lib_check_save_CFLAGS}"
-
-
- # now check for the header.
- if test "${AST_X11_FOUND}" = "yes"; then
- X11_LIB="${pbxlibdir} -lX11 "
- # if --with-X11=DIR has been specified, use it.
- if test "x${X11_DIR}" != "x"; then
- X11_INCLUDE="-I${X11_DIR}/include"
- fi
- X11_INCLUDE="${X11_INCLUDE} "
-
- # check for the header
- ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
- CPPFLAGS="${CPPFLAGS} ${X11_INCLUDE}"
- ac_fn_c_check_header_mongrel "$LINENO" "X11/Xlib.h" "ac_cv_header_X11_Xlib_h" "$ac_includes_default"
-if test "x$ac_cv_header_X11_Xlib_h" = xyes; then :
- X11_HEADER_FOUND=1
-else
- X11_HEADER_FOUND=0
-fi
-
-
- CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
-
- if test "x${X11_HEADER_FOUND}" = "x0" ; then
- X11_LIB=""
- X11_INCLUDE=""
- else
-
- PBX_X11=1
- cat >>confdefs.h <<_ACEOF
-#define HAVE_X11 1
-_ACEOF
-
- cat >>confdefs.h <<_ACEOF
-#define HAVE_X11_VERSION standard_path
-_ACEOF
-
- fi
- fi
-fi
-
-
-
-if test "x${PBX_X11}" != "x1" -a "${USE_X11}" != "no"; then
- pbxlibdir=""
- # if --with-X11=DIR has been specified, use it.
- if test "x${X11_DIR}" != "x"; then
- if test -d ${X11_DIR}/lib; then
- pbxlibdir="-L${X11_DIR}/lib"
- else
- pbxlibdir="-L${X11_DIR}"
- fi
- fi
-
- ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
- CFLAGS="${CFLAGS} -I/usr/X11R6/include"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XOpenDisplay in -lX11" >&5
-$as_echo_n "checking for XOpenDisplay in -lX11... " >&6; }
-if ${ac_cv_lib_X11_XOpenDisplay+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lX11 ${pbxlibdir} $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char XOpenDisplay ();
-int
-main ()
-{
-return XOpenDisplay ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_X11_XOpenDisplay=yes
-else
- ac_cv_lib_X11_XOpenDisplay=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_X11_XOpenDisplay" >&5
-$as_echo "$ac_cv_lib_X11_XOpenDisplay" >&6; }
-if test "x$ac_cv_lib_X11_XOpenDisplay" = xyes; then :
- AST_X11_FOUND=yes
-else
- AST_X11_FOUND=no
-fi
-
- CFLAGS="${ast_ext_lib_check_save_CFLAGS}"
-
-
- # now check for the header.
- if test "${AST_X11_FOUND}" = "yes"; then
- X11_LIB="${pbxlibdir} -lX11 "
- # if --with-X11=DIR has been specified, use it.
- if test "x${X11_DIR}" != "x"; then
- X11_INCLUDE="-I${X11_DIR}/include"
- fi
- X11_INCLUDE="${X11_INCLUDE} -I/usr/X11R6/include"
-
- # check for the header
- ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
- CPPFLAGS="${CPPFLAGS} ${X11_INCLUDE}"
- ac_fn_c_check_header_mongrel "$LINENO" "X11/Xlib.h" "ac_cv_header_X11_Xlib_h" "$ac_includes_default"
-if test "x$ac_cv_header_X11_Xlib_h" = xyes; then :
- X11_HEADER_FOUND=1
-else
- X11_HEADER_FOUND=0
-fi
-
-
- CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
-
- if test "x${X11_HEADER_FOUND}" = "x0" ; then
- X11_LIB=""
- X11_INCLUDE=""
- else
-
- PBX_X11=1
- cat >>confdefs.h <<_ACEOF
-#define HAVE_X11 1
-_ACEOF
-
- cat >>confdefs.h <<_ACEOF
-#define HAVE_X11_VERSION X11R6
-_ACEOF
-
- fi
- fi
-fi
-
-
-
PBX_LAUNCHD=0
if test "${cross_compiling}" = "no";
then
diff --git a/configure.ac b/configure.ac
index c8a84bc..16e8fa6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -480,7 +480,6 @@
AST_EXT_LIB_SETUP_OPTIONAL([OPENSSL_SRTP], [OpenSSL SRTP Extension Support], [CRYPTO], [crypto])
AST_EXT_LIB_SETUP_OPTIONAL([OPENSSL_BIO_METHOD], [OpenSSL BIO Method Support], [CRYPTO], [crypto])
AST_EXT_LIB_SETUP([DAHDI], [DAHDI], [dahdi])
-AST_EXT_LIB_SETUP([FFMPEG], [Ffmpeg and avcodec], [avcodec])
AST_EXT_LIB_SETUP([GSM], [External GSM], [gsm], [, use 'internal' GSM otherwise])
AST_EXT_LIB_SETUP([ILBC], [System iLBC], [ilbc], [, use 'internal' iLBC otherwise])
AST_EXT_LIB_SETUP([GTK2], [gtk2], [gtk2])
@@ -571,8 +570,6 @@
AST_EXT_LIB_SETUP([FFTW3], [LIBFFTW3], [fftw3])
AST_EXT_LIB_SETUP([RESAMPLE], [LIBRESAMPLE], [resample])
AST_EXT_LIB_SETUP([SNDFILE], [libsndfile], [sndfile])
-AST_EXT_LIB_SETUP([SDL], [Sdl], [sdl])
-AST_EXT_LIB_SETUP([SDL_IMAGE], [Sdl Image], [SDL_image])
AST_EXT_LIB_SETUP([SPANDSP], [SPANDSP], [spandsp])
AST_EXT_LIB_SETUP([SS7], [ISDN SS7], [ss7])
AST_EXT_LIB_SETUP([SPEEX], [Speex], [speex])
@@ -597,7 +594,6 @@
AST_EXT_LIB_SETUP([UNIXODBC], [unixODBC], [unixodbc])
AST_EXT_LIB_SETUP([VORBIS], [Vorbis], [vorbis])
AST_EXT_LIB_SETUP([VPB], [Voicetronix API], [vpb])
-AST_EXT_LIB_SETUP([X11], [X11], [x11])
AST_EXT_LIB_SETUP([ZLIB], [zlib compression], [z])
# check for basic system features and functionality before
@@ -2808,18 +2804,6 @@
AST_C_DEFINE_CHECK([MSG_NOSIGNAL], [MSG_NOSIGNAL], [sys/socket.h])
AST_C_DEFINE_CHECK([SO_NOSIGPIPE], [SO_NOSIGPIPE], [sys/socket.h])
-AST_EXT_TOOL_CHECK([SDL], [sdl-config])
-AST_EXT_LIB_CHECK([SDL_IMAGE], [SDL_image], [IMG_Load], [SDL_image.h], [${SDL_LIB}], [${SDL_INCLUDE}])
-AST_EXT_LIB_CHECK([FFMPEG], [avcodec], [sws_getContext], [ffmpeg/avcodec.h], [${PTHREAD_LIBS} -lz -lm], [${PTHREAD_CFLAGS}])
-
-# possible places for video4linux version 1
-AC_CHECK_HEADER([linux/videodev.h],
- [AC_DEFINE_UNQUOTED([HAVE_VIDEODEV_H], 1, [Define to 1 if your system has linux/videodev.h.])])
-
-# possible places for X11
-AST_EXT_LIB_CHECK([X11], [X11], [XOpenDisplay], [X11/Xlib.h],,, [standard_path])
-AST_EXT_LIB_CHECK([X11], [X11], [XOpenDisplay], [X11/Xlib.h],, [-I/usr/X11R6/include], [X11R6])
-
PBX_LAUNCHD=0
if test "${cross_compiling}" = "no";
then
diff --git a/makeopts.in b/makeopts.in
index 0d69fc8..89e6514 100644
--- a/makeopts.in
+++ b/makeopts.in
@@ -226,10 +226,8 @@
OSPTK_INCLUDE=@OSPTK_INCLUDE@
OSPTK_LIB=@OSPTK_LIB@
-# ossaudio can optionally use ffmpeg, x11, sdl and sdl_image.
-# Because sdl_image in turn depends on sdl, we don't duplicate the include
-OSS_INCLUDE=@OSS_INCLUDE@ @FFMPEG_INCLUDE@ @SDL_INCLUDE@ @X11_INCLUDE@
-OSS_LIB=@OSS_LIB@ @FFMPEG_LIB@ @SDL_LIB@ @SDL_IMAGE_LIB@ @X11_LIB@
+OSS_INCLUDE=@OSS_INCLUDE@
+OSS_LIB=@OSS_LIB@
PGSQL_INCLUDE=@PGSQL_INCLUDE@
PGSQL_LIB=@PGSQL_LIB@
@@ -275,18 +273,6 @@
RADIUS_INCLUDE=@RADIUS_INCLUDE@
RADIUS_LIB=@RADIUS_LIB@
-FFMPEG_INCLUDE=@FFMPEG_INCLUDE@
-FFMPEG_LIB=@FFMPEG_LIB@
-
-X11_INCLUDE=@X11_INCLUDE@
-X11_LIB=@X11_LIB@
-
-SDL_INCLUDE=@SDL_INCLUDE@
-SDL_LIB=@SDL_LIB@
-
-SDL_IMAGE_INCLUDE=@SDL_IMAGE_INCLUDE@
-SDL_IMAGE_LIB=@SDL_IMAGE_LIB@
-
SPANDSP_INCLUDE=@SPANDSP_INCLUDE@
SPANDSP_LIB=@SPANDSP_LIB@
--
To view, visit https://gerrit.asterisk.org/c/asterisk/+/14216
To unsubscribe, or for help writing mail filters, visit https://gerrit.asterisk.org/settings
Gerrit-Project: asterisk
Gerrit-Branch: master
Gerrit-Change-Id: I2c64c85ad07bb8bfb97aa5a9876f9e818955210c
Gerrit-Change-Number: 14216
Gerrit-PatchSet: 1
Gerrit-Owner: Alexander Traud <pabstraud at compuserve.com>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-code-review/attachments/20200415/5e9f8c6d/attachment-0001.html>
More information about the asterisk-code-review
mailing list