acinclude.m4: add a function to help checking sdl-config, gtk-config

and the like (this could be used for gtk and gtk2 as well)
Other files: add tests for sdl, sdl_image and avcodec and regenerate
	configure and autoconfig.h.in



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89351 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Luigi Rizzo 2007-11-17 01:49:26 +00:00
parent d209cb090e
commit 732c1d30c3
5 changed files with 1171 additions and 20 deletions

View File

@ -152,6 +152,23 @@ fi
])
# check for a tool using xxx-config
# AST_EXT_TOOL_CHECK([package symbol name], [package library name], [symbol], [version])
AC_DEFUN([AST_EXT_TOOL_CHECK],
[
PBX_$1=0
AC_CHECK_TOOL(CONFIG_$1, $2-config, No)
if test ! "x${CONFIG_$1}" = xNo; then
$1_INCLUDE=$(${CONFIG_$1} --cflags $3)
$1_LIB=$(${CONFIG_$1} --libs $3)
PBX_$1=1
AC_DEFINE([HAVE_$1], 1, [Define if your system has the $1 libraries.])
fi
AC_SUBST(PBX_$1)
AC_SUBST($1_INCLUDE)
AC_SUBST($1_LIB)
])
AC_DEFUN(
[AST_CHECK_GNU_MAKE], [AC_CACHE_CHECK(for GNU make, GNU_MAKE,
GNU_MAKE='Not Found' ;

1142
configure vendored

File diff suppressed because it is too large Load Diff

View File

@ -228,6 +228,10 @@ AST_EXT_LIB_SETUP([ZAPTEL], [Zaptel], [zaptel])
AST_EXT_LIB_SETUP([ZAPTEL_TRANSCODE], [Zaptel_transcode], [zaptel_transcode])
AST_EXT_LIB_SETUP([ZAPTEL_VLDTMF], [Zaptel_vldtmf], [zaptel_vldtmf])
AST_EXT_LIB_SETUP([SDL], [Sdl], [sdl])
AST_EXT_LIB_SETUP([SDL_IMAGE], [Sdl Image library], [SDL_image])
AST_EXT_LIB_SETUP([FFMPEG], [Ffmpeg and avcodec library], [avcodec])
# check for basic system features and functionality before
# checking for package libraries
@ -1152,6 +1156,10 @@ AC_CHECK_HEADER([linux/ixjuser.h], [PBX_IXJUSER=1], [PBX_IXJUSER=0], [
])
AC_SUBST(PBX_IXJUSER)
AST_EXT_TOOL_CHECK([SDL], [sdl])
AST_EXT_LIB_CHECK([SDL_IMAGE], [SDL_image], [IMG_Load], [SDL/SDL_image.h], [${SDL_LIB}])
AST_EXT_LIB_CHECK([FFMPEG], [avcodec], [sws_getContext], [ffmpeg/avcodec.h], [-lpthread -lz -lm])
PBX_GTK=0
AC_CHECK_TOOL(GTKCONFIG, gtk-config, No)
if test ! "x${GTKCONFIG}" = xNo; then

View File

@ -228,6 +228,12 @@
/* Define to 1 if you have the <fcntl.h> header file. */
#undef HAVE_FCNTL_H
/* Define this to indicate the ${FFMPEG_DESCRIP} library */
#undef HAVE_FFMPEG
/* Define to indicate the ${FFMPEG_DESCRIP} library version */
#undef HAVE_FFMPEG_VERSION
/* Define this to indicate the ${FLOOR_DESCRIP} library */
#undef HAVE_FLOOR
@ -637,6 +643,15 @@
/* Define RTLD_NOLOAD headers version */
#undef HAVE_RTLD_NOLOAD_VERSION
/* Define if your system has the SDL libraries. */
#undef HAVE_SDL
/* Define this to indicate the ${SDL_IMAGE_DESCRIP} library */
#undef HAVE_SDL_IMAGE
/* Define to indicate the ${SDL_IMAGE_DESCRIP} library version */
#undef HAVE_SDL_IMAGE_VERSION
/* Define to 1 if you have the `select' function. */
#undef HAVE_SELECT

View File

@ -144,6 +144,15 @@ QT_LIB=@QT_LIB@
RADIUS_INCLUDE=@RADIUS_INCLUDE@
RADIUS_LIB=@RADIUS_LIB@
FFMPEG_INCLUDE=@FFMPEG_INCLUDE@
FFMPEG_LIB=@FFMPEG_LIB@
SDL_INCLUDE=@SDL_INCLUDE@
SDL_LIB=@SDL_LIB@
SDL_IMAGE_INCLUDE=@SDL_IMAGE_INCLUDE@
SDL_IMAGE_LIB=@SDL_IMAGE_LIB@
SPEEX_INCLUDE=@SPEEX_INCLUDE@
SPEEX_LIB=@SPEEX_LIB@