status-im
/
sqlcipher
mirror of https://github.com/status-im/sqlcipher.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

add new amalgamation_line_macros option missing from configure.ac

This commit is contained in:
Stephen Lombardo 2021-08-02 16:49:37 -04:00
parent a646b5cedd
commit 3399ace246
2 changed files with 42 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
configure vendored
View File

@ -634,6 +634,8 @@ BUILD_CFLAGS
USE_GCOV USE_GCOV
OPT_FEATURE_FLAGS OPT_FEATURE_FLAGS
HAVE_ZLIB HAVE_ZLIB
AMALGAMATION_LINE_MACROS
amalgamation_line_macros
USE_AMALGAMATION USE_AMALGAMATION
TARGET_DEBUG TARGET_DEBUG
TARGET_HAVE_EDITLINE TARGET_HAVE_EDITLINE
@ -797,7 +799,8 @@ LIBS
CPPFLAGS CPPFLAGS
LT_SYS_LIBRARY_PATH LT_SYS_LIBRARY_PATH
CPP CPP
TCLLIBDIR' TCLLIBDIR
amalgamation_line_macros'
# Initialize some variables set by options. # Initialize some variables set by options.
@ -1484,6 +1487,8 @@ Some influential environment variables:
User-defined run-time library search path. User-defined run-time library search path.
CPP C preprocessor CPP C preprocessor
TCLLIBDIR Where to install tcl plugin TCLLIBDIR Where to install tcl plugin
amalgamation_line_macros
Use these variables to override the choices made by `configure' or to help Use these variables to override the choices made by `configure' or to help
it to find libraries and programs with nonstandard names/locations. it to find libraries and programs with nonstandard names/locations.
@ -12873,6 +12878,24 @@ if test "${enable_amalgamation}" = "no" ; then
fi fi
#########
# By default, amalgamation sqlite3.c will have #line directives.
# This is a build option not shown by ./configure --help
# To control it, use configure option: amalgamation_line_macros=?
# where ? is no to suppress #line directives or yes to create them.
AMALGAMATION_LINE_MACROS=--linemacros=1
if test "${amalgamation_line_macros+set}" = set; then :
enableval=$amalgamation_line_macros;
fi
if test "${amalgamation_line_macros}" = "yes" ; then
AMALGAMATION_LINE_MACROS=--linemacros=1
fi
if test "${amalgamation_line_macros}" = "no" ; then
AMALGAMATION_LINE_MACROS=--linemacros=0
fi
######### #########
# Look for zlib. Only needed by extensions and by the sqlite3.exe shell # Look for zlib. Only needed by extensions and by the sqlite3.exe shell
for ac_header in zlib.h for ac_header in zlib.h

18
configure.ac
View File

@ -624,6 +624,24 @@ if test "${enable_amalgamation}" = "no" ; then
fi fi
AC_SUBST(USE_AMALGAMATION) AC_SUBST(USE_AMALGAMATION)
#########
# By default, amalgamation sqlite3.c will have #line directives.
# This is a build option not shown by ./configure --help
# To control it, use configure option: amalgamation_line_macros=?
# where ? is no to suppress #line directives or yes to create them.
AMALGAMATION_LINE_MACROS=--linemacros=1
AC_ARG_VAR(amalgamation_line_macros,)
AC_SUBST(AMALGAMATION_LINE_MACROS)
if test "${amalgamation_line_macros+set}" = set; then :
enableval=$amalgamation_line_macros;
fi
if test "${amalgamation_line_macros}" = "yes" ; then
AMALGAMATION_LINE_MACROS=--linemacros=1
fi
if test "${amalgamation_line_macros}" = "no" ; then
AMALGAMATION_LINE_MACROS=--linemacros=0
fi
######### #########
# Look for zlib. Only needed by extensions and by the sqlite3.exe shell # Look for zlib. Only needed by extensions and by the sqlite3.exe shell
AC_CHECK_HEADERS(zlib.h) AC_CHECK_HEADERS(zlib.h)