Asterisk
/
asterisk
mirror of https://github.com/asterisk/asterisk
1
0
Fork 0
Code Issues Releases Wiki Activity

Add new "pri show version" command to show the libpri version for support reasons.

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@115257 65c4cc65-6c06-0410-ace0-fbb531ad65f3
1.4
Brett Bryant 18 years ago
parent 89453ef4c1
commit 61bee5aa54
5 changed files with 438 additions and 5 deletions
Show Stats Download Patch File Download Diff File

3
CHANGES
Unescape View File

@ -340,3 +340,6 @@ Changes since Asterisk 1.2:
* New manager events:
1. OriginateResponse event comes to replace OriginateSuccess and OriginateFailure
* iLBC source code no longer included (see UPGRADE.txt for details)
* New CLI command "pri show version" that shows the current version of libpri
that the library was built against (requires a version of libpri since this API
feature was added).

12
channels/chan_zap.c
Unescape View File

@ -9609,6 +9609,13 @@ static int handle_pri_set_debug_file(int fd, int argc, char **argv)
return RESULT_SUCCESS;
}
#ifdef HAVE_PRI_VERSION
static int handle_pri_version(int fd, int agc, char *argv[]) {
ast_cli(fd, "libpri version: %s\n", pri_get_version());
return RESULT_SUCCESS;
}
#endif
static int handle_pri_debug(int fd, int argc, char *argv[])
{
int span;
@ -9845,6 +9852,11 @@ static struct ast_cli_entry zap_pri_cli[] = {
{ { "pri", "unset", "debug", "file", NULL },
handle_pri_set_debug_file, "Ends PRI debug output to file" },
#ifdef HAVE_PRI_VERSION
{ { "pri", "show", "version", NULL },
handle_pri_version, "Displays version of libpri" },
#endif
};
#endif /* HAVE_PRI */

423
configure vendored
Unescape View File

@ -1,5 +1,5 @@
#! /bin/sh
# From configure.ac Revision: 107461 .
# From configure.ac Revision: 114695 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61 for asterisk 1.4.
#
@ -12089,11 +12089,13 @@ _ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <stdio.h>
#include <sys/types.h> /* for off_t */
#include <stdio.h>
int
main ()
{
return fseeko (stdin, 0, 0) && (fseeko) (stdin, 0, 0);
int (*fp) (FILE *, off_t, int) = fseeko;
return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);
;
return 0;
}
@ -12133,11 +12135,13 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#define _LARGEFILE_SOURCE 1
#include <stdio.h>
#include <sys/types.h> /* for off_t */
#include <stdio.h>
int
main ()
{
return fseeko (stdin, 0, 0) && (fseeko) (stdin, 0, 0);
int (*fp) (FILE *, off_t, int) = fseeko;
return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);
;
return 0;
}
@ -25976,6 +25980,415 @@ echo "$as_me: *** without explicitly specifying --with-${PRI_OPTION}" >&6;}
fi
if test "${USE_PRI_VERSION}" != "no"; then
pbxlibdir=""
if test "x${PRI_VERSION_DIR}" != "x"; then
if test -d ${PRI_VERSION_DIR}/lib; then
pbxlibdir="-L${PRI_VERSION_DIR}/lib"
else
pbxlibdir="-L${PRI_VERSION_DIR}"
fi
fi
{ echo "$as_me:$LINENO: checking for pri_get_version in -lpri" >&5
echo $ECHO_N "checking for pri_get_version in -lpri... $ECHO_C" >&6; }
if test "${ac_cv_lib_pri_pri_get_version+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lpri ${pbxlibdir} $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* 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 pri_get_version ();
int
main ()
{
return pri_get_version ();
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (ac_try="$ac_link"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then
ac_cv_lib_pri_pri_get_version=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_pri_pri_get_version=no
fi
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
{ echo "$as_me:$LINENO: result: $ac_cv_lib_pri_pri_get_version" >&5
echo "${ECHO_T}$ac_cv_lib_pri_pri_get_version" >&6; }
if test $ac_cv_lib_pri_pri_get_version = yes; then
AST_PRI_VERSION_FOUND=yes
else
AST_PRI_VERSION_FOUND=no
fi
if test "${AST_PRI_VERSION_FOUND}" = "yes"; then
PRI_VERSION_LIB="-lpri "
PRI_VERSION_HEADER_FOUND="1"
if test "x${PRI_VERSION_DIR}" != "x"; then
PRI_VERSION_LIB="${pbxlibdir} ${PRI_VERSION_LIB}"
PRI_VERSION_INCLUDE="-I${PRI_VERSION_DIR}/include"
saved_cppflags="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} -I${PRI_VERSION_DIR}/include"
if test "xlibpri.h" != "x" ; then
as_ac_Header=`echo "ac_cv_header_${PRI_VERSION_DIR}/include/libpri.h" | $as_tr_sh`
if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
{ echo "$as_me:$LINENO: checking for ${PRI_VERSION_DIR}/include/libpri.h" >&5
echo $ECHO_N "checking for ${PRI_VERSION_DIR}/include/libpri.h... $ECHO_C" >&6; }
if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
echo $ECHO_N "(cached) $ECHO_C" >&6
fi
ac_res=`eval echo '${'$as_ac_Header'}'`
{ echo "$as_me:$LINENO: result: $ac_res" >&5
echo "${ECHO_T}$ac_res" >&6; }
else
# Is the header compilable?
{ echo "$as_me:$LINENO: checking ${PRI_VERSION_DIR}/include/libpri.h usability" >&5
echo $ECHO_N "checking ${PRI_VERSION_DIR}/include/libpri.h usability... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
#include <${PRI_VERSION_DIR}/include/libpri.h>
_ACEOF
rm -f conftest.$ac_objext
if { (ac_try="$ac_compile"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_header_compiler=no
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
echo "${ECHO_T}$ac_header_compiler" >&6; }
# Is the header present?
{ echo "$as_me:$LINENO: checking ${PRI_VERSION_DIR}/include/libpri.h presence" >&5
echo $ECHO_N "checking ${PRI_VERSION_DIR}/include/libpri.h presence... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <${PRI_VERSION_DIR}/include/libpri.h>
_ACEOF
if { (ac_try="$ac_cpp conftest.$ac_ext"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null && {
test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
test ! -s conftest.err
}; then
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_header_preproc=no
fi
rm -f conftest.err conftest.$ac_ext
{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
echo "${ECHO_T}$ac_header_preproc" >&6; }
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
yes:no: )
{ echo "$as_me:$LINENO: WARNING: ${PRI_VERSION_DIR}/include/libpri.h: accepted by the compiler, rejected by the preprocessor!" >&5
echo "$as_me: WARNING: ${PRI_VERSION_DIR}/include/libpri.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
{ echo "$as_me:$LINENO: WARNING: ${PRI_VERSION_DIR}/include/libpri.h: proceeding with the compiler's result" >&5
echo "$as_me: WARNING: ${PRI_VERSION_DIR}/include/libpri.h: proceeding with the compiler's result" >&2;}
ac_header_preproc=yes
;;
no:yes:* )
{ echo "$as_me:$LINENO: WARNING: ${PRI_VERSION_DIR}/include/libpri.h: present but cannot be compiled" >&5
echo "$as_me: WARNING: ${PRI_VERSION_DIR}/include/libpri.h: present but cannot be compiled" >&2;}
{ echo "$as_me:$LINENO: WARNING: ${PRI_VERSION_DIR}/include/libpri.h: check for missing prerequisite headers?" >&5
echo "$as_me: WARNING: ${PRI_VERSION_DIR}/include/libpri.h: check for missing prerequisite headers?" >&2;}
{ echo "$as_me:$LINENO: WARNING: ${PRI_VERSION_DIR}/include/libpri.h: see the Autoconf documentation" >&5
echo "$as_me: WARNING: ${PRI_VERSION_DIR}/include/libpri.h: see the Autoconf documentation" >&2;}
{ echo "$as_me:$LINENO: WARNING: ${PRI_VERSION_DIR}/include/libpri.h: section \"Present But Cannot Be Compiled\"" >&5
echo "$as_me: WARNING: ${PRI_VERSION_DIR}/include/libpri.h: section \"Present But Cannot Be Compiled\"" >&2;}
{ echo "$as_me:$LINENO: WARNING: ${PRI_VERSION_DIR}/include/libpri.h: proceeding with the preprocessor's result" >&5
echo "$as_me: WARNING: ${PRI_VERSION_DIR}/include/libpri.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: ${PRI_VERSION_DIR}/include/libpri.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: ${PRI_VERSION_DIR}/include/libpri.h: in the future, the compiler will take precedence" >&2;}
( cat <<\_ASBOX
## ------------------------------- ##
## Report this to www.asterisk.org ##
## ------------------------------- ##
_ASBOX
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
{ echo "$as_me:$LINENO: checking for ${PRI_VERSION_DIR}/include/libpri.h" >&5
echo $ECHO_N "checking for ${PRI_VERSION_DIR}/include/libpri.h... $ECHO_C" >&6; }
if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
eval "$as_ac_Header=\$ac_header_preproc"
fi
ac_res=`eval echo '${'$as_ac_Header'}'`
{ echo "$as_me:$LINENO: result: $ac_res" >&5
echo "${ECHO_T}$ac_res" >&6; }
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
PRI_VERSION_HEADER_FOUND=1
else
PRI_VERSION_HEADER_FOUND=0
fi
fi
CPPFLAGS="${saved_cppflags}"
else
if test "xlibpri.h" != "x" ; then
if test "${ac_cv_header_libpri_h+set}" = set; then
{ echo "$as_me:$LINENO: checking for libpri.h" >&5
echo $ECHO_N "checking for libpri.h... $ECHO_C" >&6; }
if test "${ac_cv_header_libpri_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
fi
{ echo "$as_me:$LINENO: result: $ac_cv_header_libpri_h" >&5
echo "${ECHO_T}$ac_cv_header_libpri_h" >&6; }
else
# Is the header compilable?
{ echo "$as_me:$LINENO: checking libpri.h usability" >&5
echo $ECHO_N "checking libpri.h usability... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
#include <libpri.h>
_ACEOF
rm -f conftest.$ac_objext
if { (ac_try="$ac_compile"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_header_compiler=no
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
echo "${ECHO_T}$ac_header_compiler" >&6; }
# Is the header present?
{ echo "$as_me:$LINENO: checking libpri.h presence" >&5
echo $ECHO_N "checking libpri.h presence... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <libpri.h>
_ACEOF
if { (ac_try="$ac_cpp conftest.$ac_ext"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null && {
test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
test ! -s conftest.err
}; then
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_header_preproc=no
fi
rm -f conftest.err conftest.$ac_ext
{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
echo "${ECHO_T}$ac_header_preproc" >&6; }
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
yes:no: )
{ echo "$as_me:$LINENO: WARNING: libpri.h: accepted by the compiler, rejected by the preprocessor!" >&5
echo "$as_me: WARNING: libpri.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
{ echo "$as_me:$LINENO: WARNING: libpri.h: proceeding with the compiler's result" >&5
echo "$as_me: WARNING: libpri.h: proceeding with the compiler's result" >&2;}
ac_header_preproc=yes
;;
no:yes:* )
{ echo "$as_me:$LINENO: WARNING: libpri.h: present but cannot be compiled" >&5
echo "$as_me: WARNING: libpri.h: present but cannot be compiled" >&2;}
{ echo "$as_me:$LINENO: WARNING: libpri.h: check for missing prerequisite headers?" >&5
echo "$as_me: WARNING: libpri.h: check for missing prerequisite headers?" >&2;}
{ echo "$as_me:$LINENO: WARNING: libpri.h: see the Autoconf documentation" >&5
echo "$as_me: WARNING: libpri.h: see the Autoconf documentation" >&2;}
{ echo "$as_me:$LINENO: WARNING: libpri.h: section \"Present But Cannot Be Compiled\"" >&5
echo "$as_me: WARNING: libpri.h: section \"Present But Cannot Be Compiled\"" >&2;}
{ echo "$as_me:$LINENO: WARNING: libpri.h: proceeding with the preprocessor's result" >&5
echo "$as_me: WARNING: libpri.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: libpri.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: libpri.h: in the future, the compiler will take precedence" >&2;}
( cat <<\_ASBOX
## ------------------------------- ##
## Report this to www.asterisk.org ##
## ------------------------------- ##
_ASBOX
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
{ echo "$as_me:$LINENO: checking for libpri.h" >&5
echo $ECHO_N "checking for libpri.h... $ECHO_C" >&6; }
if test "${ac_cv_header_libpri_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_cv_header_libpri_h=$ac_header_preproc
fi
{ echo "$as_me:$LINENO: result: $ac_cv_header_libpri_h" >&5
echo "${ECHO_T}$ac_cv_header_libpri_h" >&6; }
fi
if test $ac_cv_header_libpri_h = yes; then
PRI_VERSION_HEADER_FOUND=1
else
PRI_VERSION_HEADER_FOUND=0
fi
fi
fi
if test "x${PRI_VERSION_HEADER_FOUND}" = "x0" ; then
if test -n "${PRI_VERSION_MANDATORY}" ;
then
{ echo "$as_me:$LINENO: ***" >&5
echo "$as_me: ***" >&6;}
{ echo "$as_me:$LINENO: *** It appears that you do not have the pri development package installed." >&5
echo "$as_me: *** It appears that you do not have the pri development package installed." >&6;}
{ echo "$as_me:$LINENO: *** Please install it to include ${PRI_VERSION_DESCRIP} support, or re-run configure" >&5
echo "$as_me: *** Please install it to include ${PRI_VERSION_DESCRIP} support, or re-run configure" >&6;}
{ echo "$as_me:$LINENO: *** without explicitly specifying --with-${PRI_VERSION_OPTION}" >&5
echo "$as_me: *** without explicitly specifying --with-${PRI_VERSION_OPTION}" >&6;}
exit 1
fi
PRI_VERSION_LIB=""
PRI_VERSION_INCLUDE=""
PBX_PRI_VERSION=0
else
PBX_PRI_VERSION=1
cat >>confdefs.h <<_ACEOF
#define HAVE_PRI_VERSION 1
_ACEOF
fi
elif test -n "${PRI_VERSION_MANDATORY}";
then
{ echo "$as_me:$LINENO: ***" >&5
echo "$as_me: ***" >&6;}
{ echo "$as_me:$LINENO: *** The ${PRI_VERSION_DESCRIP} installation on this system appears to be broken." >&5
echo "$as_me: *** The ${PRI_VERSION_DESCRIP} installation on this system appears to be broken." >&6;}
{ echo "$as_me:$LINENO: *** Either correct the installation, or run configure" >&5
echo "$as_me: *** Either correct the installation, or run configure" >&6;}
{ echo "$as_me:$LINENO: *** without explicitly specifying --with-${PRI_VERSION_OPTION}" >&5
echo "$as_me: *** without explicitly specifying --with-${PRI_VERSION_OPTION}" >&6;}
exit 1
fi
fi
if test "${USE_PWLIB}" != "no"; then
if test -n "${PWLIB_DIR}"; then
PWLIBDIR="${PWLIB_DIR}"

2
configure.ac
Unescape View File

@ -1212,6 +1212,8 @@ AST_EXT_LIB_CHECK([POPT], [popt], [poptStrerror], [popt.h])
AST_EXT_LIB_CHECK([PRI], [pri], [pri_keypad_facility], [libpri.h])
AST_EXT_LIB_CHECK([PRI_VERSION], [pri], [pri_get_version], [libpri.h])
if test "${USE_PWLIB}" != "no"; then
if test -n "${PWLIB_DIR}"; then
PWLIBDIR="${PWLIB_DIR}"

3
include/asterisk/autoconfig.h.in
Unescape View File

@ -277,6 +277,9 @@
/* Define to indicate the ${PRI_DESCRIP} library */
#undef HAVE_PRI
/* Define to indicate the ${PRI_VERSION_DESCRIP} library */
#undef HAVE_PRI_VERSION
/* Define if you have POSIX threads libraries and header files. */
#undef HAVE_PTHREAD

Write Preview
Loading…
Cancel
Save