diff options
| author | rizzo <rizzo@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-11-21 00:22:41 +0000 |
|---|---|---|
| committer | rizzo <rizzo@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-11-21 00:22:41 +0000 |
| commit | 4f4d5cb3bf530e0f9f688783ef72f38e118cf24c (patch) | |
| tree | dafe316b86bf6fc0b071a0b5be97dba85b49cd7e /configure.ac | |
| parent | 855aea60950d83c422e7b636c4555e71c39f4863 (diff) | |
X11 checks (at least some - for other platforms with
unusual X11 locations you might need to add more directories)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@89472 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index cd452965c..da201a94f 100644 --- a/configure.ac +++ b/configure.ac @@ -176,7 +176,8 @@ AC_ARG_ENABLE(dev-mode, AC_SUBST(AST_DEVMODE) # package option names should be in alphabetical order -# by the --with option name, to make things easier for the users :-) +# by the --with option name (the third field), +# to make things easier for the users. AST_EXT_LIB_SETUP([ALSA], [Advanced Linux Sound Architecture], [asound]) @@ -187,7 +188,7 @@ AST_EXT_LIB_SETUP([CAP], [POSIX 1.e capabilities], [cap]) AST_EXT_LIB_SETUP([CURL], [cURL], [curl]) AST_EXT_LIB_SETUP([CURSES], [curses], [curses]) AST_EXT_LIB_SETUP([CRYPTO], [OpenSSL Cryptography support], [crypto]) -AST_EXT_LIB_SETUP([GSM], [GSM], [gsm], [, or 'internal']) +AST_EXT_LIB_SETUP([GSM], [External GSM library], [gsm], [, use 'internal' GSM otherwise]) AST_EXT_LIB_SETUP([IKSEMEL], [Iksemel Jabber Library], [iksemel]) AST_EXT_LIB_SETUP([IMAP_TK], [UW IMAP Toolkit], [imap]) AST_EXT_LIB_SETUP([ISDNNET], [ISDN4Linux Library], [isdnnet]) @@ -223,6 +224,7 @@ AST_EXT_LIB_SETUP([TONEZONE], [tonezone], [tonezone]) AST_EXT_LIB_SETUP([USB], [usb], [usb]) AST_EXT_LIB_SETUP([VORBIS], [Vorbis], [vorbis]) AST_EXT_LIB_SETUP([VPB], [Voicetronix API], [vpb]) +AST_EXT_LIB_SETUP([X11], [X11 support], [x11]) AST_EXT_LIB_SETUP([ZLIB], [zlib], [z]) AST_EXT_LIB_SETUP([ZAPTEL], [Zaptel], [zaptel]) AST_EXT_LIB_SETUP([ZAPTEL_TRANSCODE], [Zaptel_transcode], [zaptel_transcode]) @@ -1182,6 +1184,10 @@ AST_EXT_TOOL_CHECK([SDL], [sdl]) 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], [-lpthread -lz -lm]) +# 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_GTK=0 AC_CHECK_TOOL(GTKCONFIG, gtk-config, No) if test ! "x${GTKCONFIG}" = xNo; then |