From 3399ace24662a076353932b8c2b1f168ebf4bf42 Mon Sep 17 00:00:00 2001 From: Stephen Lombardo Date: Mon, 2 Aug 2021 16:49:37 -0400 Subject: [PATCH] add new amalgamation_line_macros option missing from configure.ac --- configure | 25 ++++++++++++++++++++++++- configure.ac | 18 ++++++++++++++++++ 2 files changed, 42 insertions(+), 1 deletion(-) diff --git a/configure b/configure index b152d3a..c6167ed 100755 --- a/configure +++ b/configure @@ -634,6 +634,8 @@ BUILD_CFLAGS USE_GCOV OPT_FEATURE_FLAGS HAVE_ZLIB +AMALGAMATION_LINE_MACROS +amalgamation_line_macros USE_AMALGAMATION TARGET_DEBUG TARGET_HAVE_EDITLINE @@ -797,7 +799,8 @@ LIBS CPPFLAGS LT_SYS_LIBRARY_PATH CPP -TCLLIBDIR' +TCLLIBDIR +amalgamation_line_macros' # Initialize some variables set by options. @@ -1484,6 +1487,8 @@ Some influential environment variables: User-defined run-time library search path. CPP C preprocessor TCLLIBDIR Where to install tcl plugin + amalgamation_line_macros + Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. @@ -12873,6 +12878,24 @@ if test "${enable_amalgamation}" = "no" ; then 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 for ac_header in zlib.h diff --git a/configure.ac b/configure.ac index b55c935..31ca123 100644 --- a/configure.ac +++ b/configure.ac @@ -624,6 +624,24 @@ if test "${enable_amalgamation}" = "no" ; then fi 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 AC_CHECK_HEADERS(zlib.h)