mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-17 02:19:03 +00:00
res_config_sqlite: Remove deprecated module.
ASTERISK-29598 Change-Id: I8ef17023f55bf01f2e309b06f4778a8ca7252c91
This commit is contained in:
@@ -58,7 +58,6 @@ SPEEX=@PBX_SPEEX@
|
|||||||
SPEEXDSP=@PBX_SPEEXDSP@
|
SPEEXDSP=@PBX_SPEEXDSP@
|
||||||
SPEEX_PREPROCESS=@PBX_SPEEX_PREPROCESS@
|
SPEEX_PREPROCESS=@PBX_SPEEX_PREPROCESS@
|
||||||
SQLITE3=@PBX_SQLITE3@
|
SQLITE3=@PBX_SQLITE3@
|
||||||
SQLITE=@PBX_SQLITE@
|
|
||||||
SRTP=@PBX_SRTP@
|
SRTP=@PBX_SRTP@
|
||||||
SS7=@PBX_SS7@
|
SS7=@PBX_SS7@
|
||||||
OPENSSL=@PBX_OPENSSL@
|
OPENSSL=@PBX_OPENSSL@
|
||||||
|
@@ -1,11 +0,0 @@
|
|||||||
[general]
|
|
||||||
|
|
||||||
; The database file.
|
|
||||||
dbfile => /var/lib/asterisk/sqlite.db
|
|
||||||
|
|
||||||
; Both config_table and cdr_table are optional. If config_table is omitted,
|
|
||||||
; you must specify it in extconfig.conf. If it is both provided here and in
|
|
||||||
; extconfig.conf, the value given here is used. If cdr_table is omitted, CDR
|
|
||||||
; support is simply disabled.
|
|
||||||
config_table => ast_config
|
|
||||||
; cdr_table => ast_cdr
|
|
135
configure
vendored
135
configure
vendored
@@ -780,10 +780,6 @@ PBX_SQLITE3
|
|||||||
SQLITE3_DIR
|
SQLITE3_DIR
|
||||||
SQLITE3_INCLUDE
|
SQLITE3_INCLUDE
|
||||||
SQLITE3_LIB
|
SQLITE3_LIB
|
||||||
PBX_SQLITE
|
|
||||||
SQLITE_DIR
|
|
||||||
SQLITE_INCLUDE
|
|
||||||
SQLITE_LIB
|
|
||||||
PBX_SPEEXDSP
|
PBX_SPEEXDSP
|
||||||
SPEEXDSP_DIR
|
SPEEXDSP_DIR
|
||||||
SPEEXDSP_INCLUDE
|
SPEEXDSP_INCLUDE
|
||||||
@@ -1412,7 +1408,6 @@ with_spandsp
|
|||||||
with_ss7
|
with_ss7
|
||||||
with_speex
|
with_speex
|
||||||
with_speexdsp
|
with_speexdsp
|
||||||
with_sqlite
|
|
||||||
with_sqlite3
|
with_sqlite3
|
||||||
with_srtp
|
with_srtp
|
||||||
with_ssl
|
with_ssl
|
||||||
@@ -2181,7 +2176,6 @@ Optional Packages:
|
|||||||
--with-speex=PATH use Speex files in PATH
|
--with-speex=PATH use Speex files in PATH
|
||||||
--with-speex=PATH use Speex preprocess routines files in PATH
|
--with-speex=PATH use Speex preprocess routines files in PATH
|
||||||
--with-speexdsp=PATH use SpeexDSP files in PATH
|
--with-speexdsp=PATH use SpeexDSP files in PATH
|
||||||
--with-sqlite=PATH use SQLite files in PATH
|
|
||||||
--with-sqlite3=PATH use SQLite files in PATH
|
--with-sqlite3=PATH use SQLite files in PATH
|
||||||
--with-srtp=PATH use Secure RTP files in PATH
|
--with-srtp=PATH use Secure RTP files in PATH
|
||||||
--with-ssl=PATH use OpenSSL Secure Sockets Layer files in PATH
|
--with-ssl=PATH use OpenSSL Secure Sockets Layer files in PATH
|
||||||
@@ -12047,38 +12041,6 @@ PBX_SPEEX_PREPROCESS=0
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
SQLITE_DESCRIP="SQLite"
|
|
||||||
SQLITE_OPTION="sqlite"
|
|
||||||
PBX_SQLITE=0
|
|
||||||
|
|
||||||
# Check whether --with-sqlite was given.
|
|
||||||
if test "${with_sqlite+set}" = set; then :
|
|
||||||
withval=$with_sqlite;
|
|
||||||
case ${withval} in
|
|
||||||
n|no)
|
|
||||||
USE_SQLITE=no
|
|
||||||
# -1 is a magic value used by menuselect to know that the package
|
|
||||||
# was disabled, other than 'not found'
|
|
||||||
PBX_SQLITE=-1
|
|
||||||
;;
|
|
||||||
y|ye|yes)
|
|
||||||
ac_mandatory_list="${ac_mandatory_list} SQLITE"
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
SQLITE_DIR="${withval}"
|
|
||||||
ac_mandatory_list="${ac_mandatory_list} SQLITE"
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
SQLITE3_DESCRIP="SQLite"
|
SQLITE3_DESCRIP="SQLite"
|
||||||
SQLITE3_OPTION="sqlite3"
|
SQLITE3_OPTION="sqlite3"
|
||||||
PBX_SQLITE3=0
|
PBX_SQLITE3=0
|
||||||
@@ -29658,103 +29620,6 @@ fi
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
if test "x${PBX_SQLITE}" != "x1" -a "${USE_SQLITE}" != "no"; then
|
|
||||||
pbxlibdir=""
|
|
||||||
# if --with-SQLITE=DIR has been specified, use it.
|
|
||||||
if test "x${SQLITE_DIR}" != "x"; then
|
|
||||||
if test -d ${SQLITE_DIR}/lib; then
|
|
||||||
pbxlibdir="-L${SQLITE_DIR}/lib"
|
|
||||||
else
|
|
||||||
pbxlibdir="-L${SQLITE_DIR}"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
|
|
||||||
CFLAGS="${CFLAGS} "
|
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlite_exec in -lsqlite" >&5
|
|
||||||
$as_echo_n "checking for sqlite_exec in -lsqlite... " >&6; }
|
|
||||||
if ${ac_cv_lib_sqlite_sqlite_exec+:} false; then :
|
|
||||||
$as_echo_n "(cached) " >&6
|
|
||||||
else
|
|
||||||
ac_check_lib_save_LIBS=$LIBS
|
|
||||||
LIBS="-lsqlite ${pbxlibdir} $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 sqlite_exec ();
|
|
||||||
int
|
|
||||||
main ()
|
|
||||||
{
|
|
||||||
return sqlite_exec ();
|
|
||||||
;
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
_ACEOF
|
|
||||||
if ac_fn_c_try_link "$LINENO"; then :
|
|
||||||
ac_cv_lib_sqlite_sqlite_exec=yes
|
|
||||||
else
|
|
||||||
ac_cv_lib_sqlite_sqlite_exec=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_sqlite_sqlite_exec" >&5
|
|
||||||
$as_echo "$ac_cv_lib_sqlite_sqlite_exec" >&6; }
|
|
||||||
if test "x$ac_cv_lib_sqlite_sqlite_exec" = xyes; then :
|
|
||||||
AST_SQLITE_FOUND=yes
|
|
||||||
else
|
|
||||||
AST_SQLITE_FOUND=no
|
|
||||||
fi
|
|
||||||
|
|
||||||
CFLAGS="${ast_ext_lib_check_save_CFLAGS}"
|
|
||||||
|
|
||||||
|
|
||||||
# now check for the header.
|
|
||||||
if test "${AST_SQLITE_FOUND}" = "yes"; then
|
|
||||||
SQLITE_LIB="${pbxlibdir} -lsqlite "
|
|
||||||
# if --with-SQLITE=DIR has been specified, use it.
|
|
||||||
if test "x${SQLITE_DIR}" != "x"; then
|
|
||||||
SQLITE_INCLUDE="-I${SQLITE_DIR}/include"
|
|
||||||
fi
|
|
||||||
SQLITE_INCLUDE="${SQLITE_INCLUDE} "
|
|
||||||
|
|
||||||
# check for the header
|
|
||||||
ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
|
|
||||||
CPPFLAGS="${CPPFLAGS} ${SQLITE_INCLUDE}"
|
|
||||||
ac_fn_c_check_header_mongrel "$LINENO" "sqlite.h" "ac_cv_header_sqlite_h" "$ac_includes_default"
|
|
||||||
if test "x$ac_cv_header_sqlite_h" = xyes; then :
|
|
||||||
SQLITE_HEADER_FOUND=1
|
|
||||||
else
|
|
||||||
SQLITE_HEADER_FOUND=0
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
|
|
||||||
|
|
||||||
if test "x${SQLITE_HEADER_FOUND}" = "x0" ; then
|
|
||||||
SQLITE_LIB=""
|
|
||||||
SQLITE_INCLUDE=""
|
|
||||||
else
|
|
||||||
|
|
||||||
PBX_SQLITE=1
|
|
||||||
cat >>confdefs.h <<_ACEOF
|
|
||||||
#define HAVE_SQLITE 1
|
|
||||||
_ACEOF
|
|
||||||
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
if test "x${PBX_SQLITE3}" != "x1" -a "${USE_SQLITE3}" != "no"; then
|
if test "x${PBX_SQLITE3}" != "x1" -a "${USE_SQLITE3}" != "no"; then
|
||||||
pbxlibdir=""
|
pbxlibdir=""
|
||||||
# if --with-SQLITE3=DIR has been specified, use it.
|
# if --with-SQLITE3=DIR has been specified, use it.
|
||||||
|
@@ -582,7 +582,6 @@ 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_DEPENDENT([SPEEX_PREPROCESS], [speex_preprocess_ctl], [], [speex])
|
||||||
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([SRTP], [Secure RTP], [srtp])
|
AST_EXT_LIB_SETUP([SRTP], [Secure RTP], [srtp])
|
||||||
AST_EXT_LIB_SETUP_OPTIONAL([SRTP_256], [SRTP Library AES-256 (ICM)], [SRTP], [srtp])
|
AST_EXT_LIB_SETUP_OPTIONAL([SRTP_256], [SRTP Library AES-256 (ICM)], [SRTP], [srtp])
|
||||||
@@ -2584,8 +2583,6 @@ fi
|
|||||||
|
|
||||||
AC_SUBST(PBX_SPEEX_PREPROCESS)
|
AC_SUBST(PBX_SPEEX_PREPROCESS)
|
||||||
|
|
||||||
AST_EXT_LIB_CHECK([SQLITE], [sqlite], [sqlite_exec], [sqlite.h])
|
|
||||||
|
|
||||||
AST_EXT_LIB_CHECK([SQLITE3], [sqlite3], [sqlite3_open], [sqlite3.h], [${PTHREAD_LIBS}], [${PTHREAD_CFLAGS}])
|
AST_EXT_LIB_CHECK([SQLITE3], [sqlite3], [sqlite3_open], [sqlite3.h], [${PTHREAD_LIBS}], [${PTHREAD_CFLAGS}])
|
||||||
|
|
||||||
if test "${PBX_SQLITE3}" != 1; then
|
if test "${PBX_SQLITE3}" != 1; then
|
||||||
|
6
doc/UPGRADE-staging/res_config_sqlite_removal.txt
Normal file
6
doc/UPGRADE-staging/res_config_sqlite_removal.txt
Normal file
@@ -0,0 +1,6 @@
|
|||||||
|
Subject: res_config_sqlite
|
||||||
|
Master-Only: True
|
||||||
|
|
||||||
|
This module was deprecated in Asterisk 16
|
||||||
|
and is now being removed in accordance with
|
||||||
|
the Asterisk Module Deprecation policy.
|
@@ -905,9 +905,6 @@
|
|||||||
/* Define to 1 if you have the speex_preprocess_ctl library. */
|
/* Define to 1 if you have the speex_preprocess_ctl library. */
|
||||||
#undef HAVE_SPEEX_PREPROCESS
|
#undef HAVE_SPEEX_PREPROCESS
|
||||||
|
|
||||||
/* Define to 1 if you have the SQLite library. */
|
|
||||||
#undef HAVE_SQLITE
|
|
||||||
|
|
||||||
/* Define to 1 if you have the SQLite library. */
|
/* Define to 1 if you have the SQLite library. */
|
||||||
#undef HAVE_SQLITE3
|
#undef HAVE_SQLITE3
|
||||||
|
|
||||||
|
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user