Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
A
asterisk
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Issue analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Voice
asterisk
Commits
2c814afb
Commit
2c814afb
authored
7 years ago
by
Alexander Traud
Browse files
Options
Downloads
Patches
Plain Diff
BuildSystem: Enable system provided libedit on OpenBSD.
ASTERISK-27677 Change-Id: I0854e3616d1361ae9b6907d3d3444a02784ac62b
parent
be2292a2
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
configure
+103
-5
103 additions, 5 deletions
configure
configure.ac
+5
-2
5 additions, 2 deletions
configure.ac
with
108 additions
and
7 deletions
configure
+
103
−
5
View file @
2c814afb
...
...
@@ -20976,6 +20976,109 @@ $as_echo "#define HAVE_LIBEDIT 1" >>confdefs.h
fi
fi
if test "${PBX_LIBEDIT}" != 1; then
# some platforms do not list libedit via pkg-config, for example OpenBSD 6.2
if test "x${PBX_LIBEDIT}" != "x1" -a "${USE_LIBEDIT}" != "no"; then
pbxlibdir=""
# if --with-LIBEDIT=DIR has been specified, use it.
if test "x${LIBEDIT_DIR}" != "x"; then
if test -d ${LIBEDIT_DIR}/lib; then
pbxlibdir="-L${LIBEDIT_DIR}/lib"
else
pbxlibdir="-L${LIBEDIT_DIR}"
fi
fi
ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} "
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for history_init in -ledit" >&5
$as_echo_n "checking for history_init in -ledit... " >&6; }
if ${ac_cv_lib_edit_history_init+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-ledit ${pbxlibdir} -ltermcap $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 history_init ();
int
main ()
{
return history_init ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_edit_history_init=yes
else
ac_cv_lib_edit_history_init=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_edit_history_init" >&5
$as_echo "$ac_cv_lib_edit_history_init" >&6; }
if test "x$ac_cv_lib_edit_history_init" = xyes; then :
AST_LIBEDIT_FOUND=yes
else
AST_LIBEDIT_FOUND=no
fi
CFLAGS="${ast_ext_lib_check_save_CFLAGS}"
# now check for the header.
if test "${AST_LIBEDIT_FOUND}" = "yes"; then
LIBEDIT_LIB="${pbxlibdir} -ledit -ltermcap"
# if --with-LIBEDIT=DIR has been specified, use it.
if test "x${LIBEDIT_DIR}" != "x"; then
LIBEDIT_INCLUDE="-I${LIBEDIT_DIR}/include"
fi
LIBEDIT_INCLUDE="${LIBEDIT_INCLUDE} "
# check for the header
ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${LIBEDIT_INCLUDE}"
ac_fn_c_check_header_mongrel "$LINENO" "histedit.h" "ac_cv_header_histedit_h" "$ac_includes_default"
if test "x$ac_cv_header_histedit_h" = xyes; then :
LIBEDIT_HEADER_FOUND=1
else
LIBEDIT_HEADER_FOUND=0
fi
CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
if test "x${LIBEDIT_HEADER_FOUND}" = "x0" ; then
LIBEDIT_LIB=""
LIBEDIT_INCLUDE=""
else
PBX_LIBEDIT=1
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBEDIT 1
_ACEOF
fi
fi
fi
fi
if test "${PBX_LIBEDIT}" != 1; then
as_fn_error $? "*** Please install the 'libedit' development package." "$LINENO" 5
exit 1
fi
if test "x${PBX_LIBEDIT_IS_UNICODE}" != "x1" -a "${USE_LIBEDIT_IS_UNICODE}" != "no"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Testing for libedit unicode support" >&5
...
...
@@ -21017,11 +21120,6 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
if test "${PBX_LIBEDIT}" != 1; then
as_fn_error $? "*** Please install the 'libedit' development package." "$LINENO" 5
exit 1
fi
if test "x${PBX_ICONV}" != "x1" -a "${USE_ICONV}" != "no"; then
pbxlibdir=""
...
...
This diff is collapsed.
Click to expand it.
configure.ac
+
5
−
2
View file @
2c814afb
...
...
@@ -1577,12 +1577,15 @@ if test "${USE_ILBC}" != "no"; then
fi
AST_PKG_CONFIG_CHECK(LIBEDIT, libedit)
AST_C_COMPILE_CHECK([LIBEDIT_IS_UNICODE], [el_rfunc_t *callback;], [histedit.h], [], [Testing for libedit unicode support])
if test "${PBX_LIBEDIT}" != 1; then
# some platforms do not list libedit via pkg-config, for example OpenBSD 6.2
AST_EXT_LIB_CHECK([LIBEDIT], [edit], [history_init], [histedit.h], [-ltermcap])
fi
if test "${PBX_LIBEDIT}" != 1; then
AC_MSG_ERROR(*** Please install the 'libedit' development package.)
exit 1
fi
AST_C_COMPILE_CHECK([LIBEDIT_IS_UNICODE], [el_rfunc_t *callback;], [histedit.h], [], [Testing for libedit unicode support])
AST_EXT_LIB_CHECK([ICONV], [iconv], [iconv_open], [iconv.h])
# GNU libiconv #define's iconv_open to libiconv_open, so we need to search for that symbol
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment