Skip to content
Snippets Groups Projects
Commit 74d7f7f7 authored by Tilghman Lesher's avatar Tilghman Lesher
Browse files

Merged revisions 214436 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r214436 | tilghman | 2009-08-27 11:53:58 -0500 (Thu, 27 Aug 2009) | 2 lines
  
  One more build system change, to make the descriptions look better, if we have better information.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@214466 65c4cc65-6c06-0410-ace0-fbb531ad65f3
parent f2e9a73c
Branches
Tags
No related merge requests found
...@@ -30,12 +30,35 @@ AC_DEFUN([AST_EXT_LIB_SETUP], ...@@ -30,12 +30,35 @@ AC_DEFUN([AST_EXT_LIB_SETUP],
esac esac
]) ])
AH_TEMPLATE(m4_bpatsubst([[HAVE_$1]], [(.*)]), [Define to 1 if you have the $2 library.]) AH_TEMPLATE(m4_bpatsubst([[HAVE_$1]], [(.*)]), [Define to 1 if you have the $2 library.])
AH_TEMPLATE(m4_bpatsubst([[HAVE_$1_VERSION]], [(.*)]), [Define to the version of the $2 library.])
AC_SUBST([$1_LIB]) AC_SUBST([$1_LIB])
AC_SUBST([$1_INCLUDE]) AC_SUBST([$1_INCLUDE])
AC_SUBST([$1_DIR]) AC_SUBST([$1_DIR])
AC_SUBST([PBX_$1]) AC_SUBST([PBX_$1])
]) ])
# AST_EXT_LIB_SETUP_DEPENDENT([package symbol name], [package friendly name], [master package symbol name], [master package option name])
AC_DEFUN([AST_EXT_LIB_SETUP_DEPENDENT],
[
$1_DESCRIP="$2"
m4_ifval([$4], [$1_OPTION=$4])
m4_ifval([$3], [
for i in ${ac_mandatory_list}; do
if test "x$3" = "x$i"; then
ac_mandatory_list="${ac_mandatory_list} $1"
break
fi
done
])
PBX_$1=0
AH_TEMPLATE(m4_bpatsubst([[HAVE_$1]], [(.*)]), [Define to 1 if you have the $2 library.])
AC_SUBST([$1_LIB])
AC_SUBST([$1_INCLUDE])
AC_SUBST([$1_DIR])
AC_SUBST([PBX_$1])
])
# Check for existence of a given package ($1), either looking up a function # Check for existence of a given package ($1), either looking up a function
# in a library, or, if no function is supplied, only check for the # in a library, or, if no function is supplied, only check for the
# existence of the header files. # existence of the header files.
...@@ -66,7 +89,7 @@ if test "x${PBX_$1}" != "x1" -a "${USE_$1}" != "no"; then ...@@ -66,7 +89,7 @@ if test "x${PBX_$1}" != "x1" -a "${USE_$1}" != "no"; then
$1_LIB="${pbxlibdir} -l$2 $5" $1_LIB="${pbxlibdir} -l$2 $5"
# if --with-$1=DIR has been specified, use it. # if --with-$1=DIR has been specified, use it.
if test "x${$1_DIR}" != "x"; then if test "x${$1_DIR}" != "x"; then
$1_INCLUDE="-I${$1_DIR}/include" $1_INCLUDE="-I${$1_DIR}/include"
fi fi
$1_INCLUDE="${$1_INCLUDE} $6" $1_INCLUDE="${$1_INCLUDE} $6"
if test "x$4" = "x" ; then # no header, assume found if test "x$4" = "x" ; then # no header, assume found
...@@ -82,22 +105,13 @@ if test "x${PBX_$1}" != "x1" -a "${USE_$1}" != "no"; then ...@@ -82,22 +105,13 @@ if test "x${PBX_$1}" != "x1" -a "${USE_$1}" != "no"; then
$1_INCLUDE="" $1_INCLUDE=""
else else
if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
$1_LIB="" $1_LIB=""
fi fi
PBX_$1=1 PBX_$1=1
if test "x${$1_OPTION}" = "x"; then cat >>confdefs.h <<_ACEOF
dnl Ensure that we have an autoheader, when AST_EXT_LIB_SETUP was
dnl not called. Note that we cannot use shell substitution in the
dnl description, because the shell is never invoked when rendering
dnl the autoheader. Only m4 substitutions will expand correctly.
AC_DEFINE_UNQUOTED([HAVE_$1], 1, [Define to 1 to indicate $1 functionality.])
AC_DEFINE_UNQUOTED([HAVE_$1_VERSION], [$7], [Define to indicate the $1 library version])
else
cat >>confdefs.h <<_ACEOF
[@%:@define] HAVE_$1 1 [@%:@define] HAVE_$1 1
[@%:@define] HAVE_$1_VERSION $7 [@%:@define] HAVE_$1_VERSION $7
_ACEOF _ACEOF
fi
fi fi
fi fi
fi fi
......
This diff is collapsed.
...@@ -276,6 +276,11 @@ AST_EXT_LIB_SETUP([PGSQL], [PostgreSQL], [postgres]) ...@@ -276,6 +276,11 @@ AST_EXT_LIB_SETUP([PGSQL], [PostgreSQL], [postgres])
AST_EXT_LIB_SETUP([POPT], [popt], [popt]) AST_EXT_LIB_SETUP([POPT], [popt], [popt])
AST_EXT_LIB_SETUP([PORTAUDIO], [PortAudio], [portaudio]) AST_EXT_LIB_SETUP([PORTAUDIO], [PortAudio], [portaudio])
AST_EXT_LIB_SETUP([PRI], [ISDN PRI], [pri]) AST_EXT_LIB_SETUP([PRI], [ISDN PRI], [pri])
AST_EXT_LIB_SETUP_DEPENDENT([PRI_VERSION], [ISDN PRI get_version], [PRI], [pri])
AST_EXT_LIB_SETUP_DEPENDENT([PRI_INBANDDISCONNECT], [ISDN PRI set_inbanddisconnect], [PRI], [pri])
AST_EXT_LIB_SETUP_DEPENDENT([PRI_PROG_W_CAUSE], [ISDN progress with cause], [PRI], [pri])
AST_EXT_LIB_SETUP_DEPENDENT([PRI_SERVICE_MESSAGES], [ISDN service messages], [PRI], [pri])
AST_EXT_LIB_SETUP_DEPENDENT([PRI_REVERSE_CHARGE], [ISDN reverse charge], [PRI], [pri])
AST_EXT_LIB_SETUP([RESAMPLE], [LIBRESAMPLE], [resample]) AST_EXT_LIB_SETUP([RESAMPLE], [LIBRESAMPLE], [resample])
AST_EXT_LIB_SETUP([SPANDSP], [SPANDSP], [spandsp]) AST_EXT_LIB_SETUP([SPANDSP], [SPANDSP], [spandsp])
AST_EXT_LIB_SETUP([SS7], [ISDN SS7], [ss7]) AST_EXT_LIB_SETUP([SS7], [ISDN SS7], [ss7])
...@@ -289,6 +294,7 @@ AST_EXT_LIB_SETUP([OPENAIS], [OpenAIS], [openais]) ...@@ -289,6 +294,7 @@ AST_EXT_LIB_SETUP([OPENAIS], [OpenAIS], [openais])
AST_EXT_LIB_SETUP([SPEEX], [Speex], [speex]) AST_EXT_LIB_SETUP([SPEEX], [Speex], [speex])
AST_EXT_LIB_SETUP([SPEEX_PREPROCESS], [Speex preprocess routines], [speex]) AST_EXT_LIB_SETUP([SPEEX_PREPROCESS], [Speex preprocess routines], [speex])
AST_EXT_LIB_SETUP([SPEEXDSP], [Speexdsp], [speexdsp]) AST_EXT_LIB_SETUP([SPEEXDSP], [Speexdsp], [speexdsp])
AST_EXT_LIB_SETUP_DEPENDENT([SPEEX_PREPROCESS], [speex_preprocess_ctl], [], [speex])
AST_EXT_LIB_SETUP([SQLITE], [SQLite], [sqlite]) AST_EXT_LIB_SETUP([SQLITE], [SQLite], [sqlite])
AST_EXT_LIB_SETUP([SQLITE3], [SQLite], [sqlite3]) AST_EXT_LIB_SETUP([SQLITE3], [SQLite], [sqlite3])
AST_EXT_LIB_SETUP([SUPPSERV], [mISDN Supplemental Services], [suppserv]) AST_EXT_LIB_SETUP([SUPPSERV], [mISDN Supplemental Services], [suppserv])
...@@ -360,9 +366,11 @@ AC_FUNC_STRNLEN ...@@ -360,9 +366,11 @@ AC_FUNC_STRNLEN
AC_FUNC_STRTOD AC_FUNC_STRTOD
AC_FUNC_UTIME_NULL AC_FUNC_UTIME_NULL
AC_FUNC_VPRINTF AC_FUNC_VPRINTF
AC_CHECK_FUNCS([asprintf atexit closefrom dup2 eaccess endpwent euidaccess ftruncate getcwd gethostbyname gethostname getloadavg gettimeofday ioperm inet_ntoa isascii localtime_r memchr memmove memset mkdir munmap putenv re_comp regcomp select setenv socket strcasecmp strcasestr strchr strcspn strdup strerror strlcat strlcpy strncasecmp strndup strnlen strrchr strsep strspn strstr strtol strtoq unsetenv utime vasprintf getpeereid sysctl swapctl]) AC_CHECK_FUNCS([asprintf atexit closefrom dup2 eaccess endpwent euidaccess ftruncate getcwd gethostbyname gethostname getloadavg gettimeofday glob ioperm inet_ntoa isascii localtime_r memchr memmove memset mkdir munmap putenv re_comp regcomp select setenv socket strcasecmp strcasestr strchr strcspn strdup strerror strlcat strlcpy strncasecmp strndup strnlen strrchr strsep strspn strstr strtod strtol strtold strtoq unsetenv utime vasprintf getpeereid sysctl swapctl])
AC_CHECK_FUNCS([glob]) # BSD might not have exp2, and/or log2
AC_CHECK_LIB([m], [sqrt])
AC_CHECK_FUNCS([exp2l log2l exp10l log10l sinl cosl tanl asinl acosl atanl atan2l powl sqrtl rintl expl logl remainderl fmodl roundl truncl floorl ceill exp2 log2 exp10 log10 sin cos tan asin acos atan atan2 pow rint exp log remainder fmod round trunc floor ceil])
AC_MSG_CHECKING(for timersub in time.h) AC_MSG_CHECKING(for timersub in time.h)
AC_LINK_IFELSE( AC_LINK_IFELSE(
...@@ -683,54 +691,6 @@ AST_C_COMPILE_CHECK([DAHDI_LINEREVERSE_VMWI], [struct dahdi_vmwi_info booger], [ ...@@ -683,54 +691,6 @@ AST_C_COMPILE_CHECK([DAHDI_LINEREVERSE_VMWI], [struct dahdi_vmwi_info booger], [
AST_C_COMPILE_CHECK([DAHDI_ECHOCANCEL_FAX_MODE], [int foo = DAHDI_ECHOCANCEL_FAX_MODE], [dahdi/user.h]) AST_C_COMPILE_CHECK([DAHDI_ECHOCANCEL_FAX_MODE], [int foo = DAHDI_ECHOCANCEL_FAX_MODE], [dahdi/user.h])
# BSD might not have exp2, and/or log2
AST_EXT_LIB_CHECK([EXP2L], [m], [exp2l])
AST_EXT_LIB_CHECK([LOG2L], [m], [log2l])
AST_EXT_LIB_CHECK([EXP10L], [m], [exp10l])
AST_EXT_LIB_CHECK([LOG10L], [m], [log10l])
AST_EXT_LIB_CHECK([SINL], [m], [sinl])
AST_EXT_LIB_CHECK([COSL], [m], [cosl])
AST_EXT_LIB_CHECK([TANL], [m], [tanl])
AST_EXT_LIB_CHECK([ASINL], [m], [asinl])
AST_EXT_LIB_CHECK([ACOSL], [m], [acosl])
AST_EXT_LIB_CHECK([ATANL], [m], [atanl])
AST_EXT_LIB_CHECK([ATAN2L], [m], [atan2l])
AST_EXT_LIB_CHECK([POWL], [m], [powl])
AST_EXT_LIB_CHECK([SQRTL], [m], [sqrtl])
AST_EXT_LIB_CHECK([RINTL], [m], [rintl])
AST_EXT_LIB_CHECK([EXPL], [m], [expl])
AST_EXT_LIB_CHECK([LOGL], [m], [logl])
AST_EXT_LIB_CHECK([REMAINDERL], [m], [remainderl])
AST_EXT_LIB_CHECK([FMODL], [m], [fmodl])
AST_EXT_LIB_CHECK([ROUNDL], [m], [roundl])
AST_EXT_LIB_CHECK([TRUNCL], [m], [truncl])
AST_EXT_LIB_CHECK([STRTOLD], [c], [strtold], [stdlib.h])
AST_EXT_LIB_CHECK([FLOORL], [m], [floorl])
AST_EXT_LIB_CHECK([CEILL], [m], [ceill])
AST_EXT_LIB_CHECK([EXP2], [m], [exp2])
AST_EXT_LIB_CHECK([LOG2], [m], [log2])
AST_EXT_LIB_CHECK([EXP10], [m], [exp10])
AST_EXT_LIB_CHECK([LOG10], [m], [log10])
AST_EXT_LIB_CHECK([SIN], [m], [sin])
AST_EXT_LIB_CHECK([COS], [m], [cos])
AST_EXT_LIB_CHECK([TAN], [m], [tan])
AST_EXT_LIB_CHECK([ASIN], [m], [asin])
AST_EXT_LIB_CHECK([ACOS], [m], [acos])
AST_EXT_LIB_CHECK([ATAN], [m], [atan])
AST_EXT_LIB_CHECK([ATAN2], [m], [atan2])
AST_EXT_LIB_CHECK([POW], [m], [pow])
AST_EXT_LIB_CHECK([SQRT], [m], [sqrt])
AST_EXT_LIB_CHECK([RINT], [m], [rint])
AST_EXT_LIB_CHECK([EXP], [m], [exp])
AST_EXT_LIB_CHECK([LOG], [m], [log])
AST_EXT_LIB_CHECK([REMAINDER], [m], [remainder])
AST_EXT_LIB_CHECK([FMOD], [m], [fmod])
AST_EXT_LIB_CHECK([ROUND], [m], [round])
AST_EXT_LIB_CHECK([TRUNC], [m], [trunc])
AST_EXT_LIB_CHECK([STRTOD], [c], [strtod], [stdlib.h])
AST_EXT_LIB_CHECK([FLOOR], [m], [floor])
AST_EXT_LIB_CHECK([CEIL], [m], [ceil])
AST_C_COMPILE_CHECK([GETIFADDRS], [struct ifaddrs *p; getifaddrs(&p)], [ifaddrs.h], , [getifaddrs() support]) AST_C_COMPILE_CHECK([GETIFADDRS], [struct ifaddrs *p; getifaddrs(&p)], [ifaddrs.h], , [getifaddrs() support])
AST_C_COMPILE_CHECK([TIMERFD], [timerfd_create(0,0); timerfd_settime(0,0,NULL,NULL);], [sys/timerfd.h], , [timerfd support]) AST_C_COMPILE_CHECK([TIMERFD], [timerfd_create(0,0); timerfd_settime(0,0,NULL,NULL);], [sys/timerfd.h], , [timerfd support])
......
This diff is collapsed.
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment