Reinstate the --disable-tcl option on ./configure.

[forum:/forumpost/845d4a57becc7f3c|Forum thread 845d4a57becc7f3c]. FossilOrigin-Name: de927016aadd7ee55d947134e3540907a3ea5ab4015034c5d088e3a84905d98a
2025-12-24 14:17:58 +03:00 · 2024-08-15 15:23:33 +00:00
parent ff7200e75b
commit 3f138e1d8f
4 changed files with 142 additions and 122 deletions
--- a/138
+++ b/138
@@ -888,6 +888,7 @@ enable_libtool_lock
 enable_largefile
 with_tclsh
 with_tcl
+enable_tcl
 with_wasi_sdk
 enable_threadsafe
 enable_releasemode
@@ -1543,6 +1544,7 @@ Optional Features:
                          optimize for fast installation [default=yes]
  --disable-libtool-lock  avoid locking (might break parallel builds)
  --disable-largefile     omit support for large files
+  --disable-tcl           do not build TCL extension
  --disable-threadsafe    Disable mutexing
  --enable-releasemode    Support libtool link to release mode
  --enable-tempstore      Use an in-ram database for temporary tables
@@ -3936,13 +3938,13 @@ if ${lt_cv_nm_interface+:} false; then :
 else
  lt_cv_nm_interface="BSD nm"
  echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:3939: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:3941: $ac_compile\"" >&5)
  (eval "$ac_compile" 2>conftest.err)
  cat conftest.err >&5
-  (eval echo "\"\$as_me:3942: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:3944: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
  (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
  cat conftest.err >&5
-  (eval echo "\"\$as_me:3945: output\"" >&5)
+  (eval echo "\"\$as_me:3947: output\"" >&5)
  cat conftest.out >&5
  if $GREP 'External.*some_variable' conftest.out > /dev/null; then
    lt_cv_nm_interface="MS dumpbin"
@@ -5148,7 +5150,7 @@ ia64-*-hpux*)
  ;;
 *-*-irix6*)
  # Find out which ABI we are using.
-  echo '#line 5151 "configure"' > conftest.$ac_ext
+  echo '#line 5153 "configure"' > conftest.$ac_ext
  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
@@ -6673,11 +6675,11 @@ else
   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:6676: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:6678: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>conftest.err)
   ac_status=$?
   cat conftest.err >&5
-   echo "$as_me:6680: \$? = $ac_status" >&5
+   echo "$as_me:6682: \$? = $ac_status" >&5
   if (exit $ac_status) && test -s "$ac_outfile"; then
     # The compiler can only warn and ignore the option if not recognized
     # So say no if there are warnings other than the usual output.
@@ -7012,11 +7014,11 @@ else
   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7015: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7017: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>conftest.err)
   ac_status=$?
   cat conftest.err >&5
-   echo "$as_me:7019: \$? = $ac_status" >&5
+   echo "$as_me:7021: \$? = $ac_status" >&5
   if (exit $ac_status) && test -s "$ac_outfile"; then
     # The compiler can only warn and ignore the option if not recognized
     # So say no if there are warnings other than the usual output.
@@ -7117,11 +7119,11 @@ else
   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7120: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7122: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>out/conftest.err)
   ac_status=$?
   cat out/conftest.err >&5
-   echo "$as_me:7124: \$? = $ac_status" >&5
+   echo "$as_me:7126: \$? = $ac_status" >&5
   if (exit $ac_status) && test -s out/conftest2.$ac_objext
   then
     # The compiler can only warn and ignore the option if not recognized
@@ -7172,11 +7174,11 @@ else
   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7175: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7177: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>out/conftest.err)
   ac_status=$?
   cat out/conftest.err >&5
-   echo "$as_me:7179: \$? = $ac_status" >&5
+   echo "$as_me:7181: \$? = $ac_status" >&5
   if (exit $ac_status) && test -s out/conftest2.$ac_objext
   then
     # The compiler can only warn and ignore the option if not recognized
@@ -9552,7 +9554,7 @@ else
  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
  lt_status=$lt_dlunknown
  cat > conftest.$ac_ext <<_LT_EOF
-#line 9555 "configure"
+#line 9557 "configure"
 #include "confdefs.h"

 #if HAVE_DLFCN_H
@@ -9648,7 +9650,7 @@ else
  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
  lt_status=$lt_dlunknown
  cat > conftest.$ac_ext <<_LT_EOF
-#line 9651 "configure"
+#line 9653 "configure"
 #include "confdefs.h"

 #if HAVE_DLFCN_H
@@ -10320,6 +10322,13 @@ if test "${with_tcl+set}" = set; then :
  withval=$with_tcl;
 fi

+# Check whether --enable-tcl was given.
+if test "${enable_tcl+set}" = set; then :
+  enableval=$enable_tcl; use_tcl=$enableval
+else
+  use_tcl=yes
+fi
+
 if test x"${with_tclsh}" == x -a x"${with_tcl}" == x; then
  for ac_prog in tclsh8.6 tclsh tclsh9.0
 do
@@ -10370,60 +10379,69 @@ if test x"${with_tclsh}" != x -a x"${with_tclsh}" != xnone; then
  TCLSH_CMD=${with_tclsh}
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: using tclsh at \"$TCLSH_CMD\"" >&5
 $as_echo "using tclsh at \"$TCLSH_CMD\"" >&6; }
-  with_tcl=`${with_tclsh} <${srcdir}/tool/find_tclconfig.tcl`
-  if test x"${with_tcl}" != x; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $TCLSH_CMD recommends the tclConfig.sh at ${with_tcl}" >&5
+  if test x"${use_tcl}" = "xyes"; then
+    with_tcl=`${with_tclsh} <${srcdir}/tool/find_tclconfig.tcl`
+    if test x"${with_tcl}" != x; then
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $TCLSH_CMD recommends the tclConfig.sh at ${with_tcl}" >&5
 $as_echo "$TCLSH_CMD recommends the tclConfig.sh at ${with_tcl}" >&6; }
-  else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $TCLSH_CMD is unable to recommend a tclConfig.sh" >&5
+    else
+      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $TCLSH_CMD is unable to recommend a tclConfig.sh" >&5
 $as_echo "$as_me: WARNING: $TCLSH_CMD is unable to recommend a tclConfig.sh" >&2;}
+    fi
  fi
 fi
-if test x"${with_tcl}" != x; then
-  if test -r ${with_tcl}/tclConfig.sh; then
-    tclconfig="${with_tcl}/tclConfig.sh"
+if test x"${use_tcl}" = "xyes"; then
+  if test x"${with_tcl}" != x; then
+    if test -r ${with_tcl}/tclConfig.sh; then
+      tclconfig="${with_tcl}/tclConfig.sh"
+    else
+      for i in tcl8.6 tcl9.0 lib; do
+        if test -r ${with_tcl}/$i/tclConfig.sh; then
+          tclconfig=${with_tcl}/$i/tclConfig.sh
+          break
+        fi
+      done
+    fi
+    if test ! -r "${tclconfig}"; then
+      as_fn_error $? "no tclConfig.sh file found under ${with_tcl}" "$LINENO" 5
+    fi
  else
-    for i in tcl8.6 tcl9.0 lib; do
-      if test -r ${with_tcl}/$i/tclConfig.sh; then
-        tclconfig=${with_tcl}/$i/tclConfig.sh
-        break
-      fi
-    done
+    # If we have not yet found a tclConfig.sh file, look in $libdir whic is
+    # set automatically by autoconf or by the --prefix command-line option.
+    # See https://sqlite.org/forum/forumpost/e04e693439a22457
+    libdir=${prefix}/lib
+    if test -r ${libdir}/tclConfig.sh; then
+      tclconfig=${libdir}/tclConfig.sh
+    else
+      for i in tcl8.6 tcl9.0 lib; do
+        if test -r ${libdir}/$i/tclConfig.sh; then
+          tclconfig=${libdir}/$i/tclConfig.sh
+          break
+        fi
+      done
+    fi
+    if test ! -r "${tclconfig}"; then
+      as_fn_error $? "cannot find a usable tclConfig.sh file.
+        Use --with-tcl=DIR to specify a directory where tclConfig.sh can be found.
+        SQLite does not use TCL internally, but TCL is required to build SQLite
+        from canonical sources and TCL is required for testing." "$LINENO" 5
+    fi
  fi
-  if test ! -r "${tclconfig}"; then
-    as_fn_error $? "no tclConfig.sh file found under ${with_tcl}" "$LINENO" 5
-  fi
-else
-  # If we have not yet found a tclConfig.sh file, look in $libdir whic is
-  # set automatically by autoconf or by the --prefix command-line option.
-  # See https://sqlite.org/forum/forumpost/e04e693439a22457
-  libdir=${prefix}/lib
-  if test -r ${libdir}/tclConfig.sh; then
-    tclconfig=${libdir}/tclConfig.sh
-  else
-    for i in tcl8.6 tcl9.0 lib; do
-      if test -r ${libdir}/$i/tclConfig.sh; then
-        tclconfig=${libdir}/$i/tclConfig.sh
-        break
-      fi
-    done
-  fi
-  if test ! -r "${tclconfig}"; then
-    as_fn_error $? "cannot find a usable tclConfig.sh file.
-      Use --with-tcl=DIR to specify a directory where tclConfig.sh can be found.
-      SQLite does not use TCL internally, but TCL is required to build SQLite
-      from canonical sources and TCL is required for testing." "$LINENO" 5
-  fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: loading TCL configuration from ${tclconfig}" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: loading TCL configuration from ${tclconfig}" >&5
 $as_echo "loading TCL configuration from ${tclconfig}" >&6; }
-. ${tclconfig}
+  . ${tclconfig}



-# There are lots of other configuration variables that are provided by the
-# tclConfig.sh file and that could be included here.  But as of right now,
-# TCL_LIB_SPEC is the only what that the Makefile uses.
+  # There are lots of other configuration variables that are provided by the
+  # tclConfig.sh file and that could be included here.  But as of right now,
+  # TCL_LIB_SPEC is the only what that the Makefile uses.
+  HAVE_TCL=1
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: unable to run tests because of --disable-tcl" >&5
+$as_echo "unable to run tests because of --disable-tcl" >&6; }
+  HAVE_TCL=0
+fi

 if test x"$TCLSH_CMD" == x; then
  TCLSH_CMD=${TCL_EXEC_PREFIX}/bin/tclsh${TCL_VERSION}
@@ -10445,14 +10463,10 @@ if test "$TCLSH_CMD" = "none"; then
 $as_echo "$as_me: WARNING: Warning: can't find tclsh - defaulting to non-amalgamation build." >&2;}
  USE_AMALGAMATION=0
  TCLSH_CMD="tclsh"
-  HAVE_TCL=0
-else
-  HAVE_TCL=1
 fi



-
 if test "x${TCLLIBDIR+set}" != "xset" ; then
  for i in `echo 'puts stdout $auto_path' | ${TCLSH_CMD}` ; do
    if test -d $i ; then
--- a/configure.ac
+++ b/configure.ac
@@ -121,6 +121,8 @@ USE_AMALGAMATION=1
 #
 AC_ARG_WITH(tclsh, AS_HELP_STRING([--with-tclsh=PATHNAME],[full pathname of a tclsh to use]))
 AC_ARG_WITH(tcl, AS_HELP_STRING([--with-tcl=DIR],[directory containing (tclConfig.sh)]))
+AC_ARG_ENABLE(tcl, AS_HELP_STRING([--disable-tcl],[do not build TCL extension]),
+      [use_tcl=$enableval],[use_tcl=yes])
 if test x"${with_tclsh}" == x -a x"${with_tcl}" == x; then
  AC_CHECK_PROGS(TCLSH_CMD, [tclsh8.6 tclsh tclsh9.0],none)
  with_tclsh=${TCLSH_CMD}
@@ -128,58 +130,66 @@ fi
 if test x"${with_tclsh}" != x -a x"${with_tclsh}" != xnone; then
  TCLSH_CMD=${with_tclsh}
  AC_MSG_RESULT([using tclsh at "$TCLSH_CMD"])
-  with_tcl=`${with_tclsh} <${srcdir}/tool/find_tclconfig.tcl`
+  if test x"${use_tcl}" = "xyes"; then
+    with_tcl=`${with_tclsh} <${srcdir}/tool/find_tclconfig.tcl`
+    if test x"${with_tcl}" != x; then
+      AC_MSG_RESULT([$TCLSH_CMD recommends the tclConfig.sh at ${with_tcl}])
+    else
+      AC_MSG_WARN([$TCLSH_CMD is unable to recommend a tclConfig.sh])
+    fi
+  fi
+fi
+if test x"${use_tcl}" = "xyes"; then
  if test x"${with_tcl}" != x; then
-    AC_MSG_RESULT([$TCLSH_CMD recommends the tclConfig.sh at ${with_tcl}])
+    if test -r ${with_tcl}/tclConfig.sh; then
+      tclconfig="${with_tcl}/tclConfig.sh"
+    else
+      for i in tcl8.6 tcl9.0 lib; do
+        if test -r ${with_tcl}/$i/tclConfig.sh; then
+          tclconfig=${with_tcl}/$i/tclConfig.sh
+          break
+        fi
+      done
+    fi
+    if test ! -r "${tclconfig}"; then
+      AC_MSG_ERROR([no tclConfig.sh file found under ${with_tcl}])
+    fi
  else
-    AC_MSG_WARN([$TCLSH_CMD is unable to recommend a tclConfig.sh])
-  fi
-fi
-if test x"${with_tcl}" != x; then
-  if test -r ${with_tcl}/tclConfig.sh; then
-    tclconfig="${with_tcl}/tclConfig.sh"
-  else
-    for i in tcl8.6 tcl9.0 lib; do
-      if test -r ${with_tcl}/$i/tclConfig.sh; then
-        tclconfig=${with_tcl}/$i/tclConfig.sh
-        break
-      fi
-    done
-  fi
-  if test ! -r "${tclconfig}"; then
-    AC_MSG_ERROR([no tclConfig.sh file found under ${with_tcl}])
+    # If we have not yet found a tclConfig.sh file, look in $libdir whic is
+    # set automatically by autoconf or by the --prefix command-line option.
+    # See https://sqlite.org/forum/forumpost/e04e693439a22457
+    libdir=${prefix}/lib
+    if test -r ${libdir}/tclConfig.sh; then
+      tclconfig=${libdir}/tclConfig.sh
+    else
+      for i in tcl8.6 tcl9.0 lib; do
+        if test -r ${libdir}/$i/tclConfig.sh; then
+          tclconfig=${libdir}/$i/tclConfig.sh
+          break
+        fi
+      done
+    fi
+    if test ! -r "${tclconfig}"; then
+      AC_MSG_ERROR([cannot find a usable tclConfig.sh file. 
+        Use --with-tcl=DIR to specify a directory where tclConfig.sh can be found.
+        SQLite does not use TCL internally, but TCL is required to build SQLite
+        from canonical sources and TCL is required for testing.])
+    fi
  fi
+  AC_MSG_RESULT([loading TCL configuration from ${tclconfig}])
+  . ${tclconfig}
+  AC_SUBST(TCL_INCLUDE_SPEC)
+  AC_SUBST(TCL_LIB_SPEC)
+  AC_SUBST(TCL_STUB_LIB_SPEC)
+  # There are lots of other configuration variables that are provided by the
+  # tclConfig.sh file and that could be included here.  But as of right now,
+  # TCL_LIB_SPEC is the only what that the Makefile uses.
+  HAVE_TCL=1
 else
-  # If we have not yet found a tclConfig.sh file, look in $libdir whic is
-  # set automatically by autoconf or by the --prefix command-line option.
-  # See https://sqlite.org/forum/forumpost/e04e693439a22457
-  libdir=${prefix}/lib
-  if test -r ${libdir}/tclConfig.sh; then
-    tclconfig=${libdir}/tclConfig.sh
-  else
-    for i in tcl8.6 tcl9.0 lib; do
-      if test -r ${libdir}/$i/tclConfig.sh; then
-        tclconfig=${libdir}/$i/tclConfig.sh
-        break
-      fi
-    done
-  fi
-  if test ! -r "${tclconfig}"; then
-    AC_MSG_ERROR([cannot find a usable tclConfig.sh file. 
-      Use --with-tcl=DIR to specify a directory where tclConfig.sh can be found.
-      SQLite does not use TCL internally, but TCL is required to build SQLite
-      from canonical sources and TCL is required for testing.])
-  fi
+  AC_MSG_RESULT([unable to run tests because of --disable-tcl])
+  HAVE_TCL=0
 fi
-AC_MSG_RESULT([loading TCL configuration from ${tclconfig}])
-. ${tclconfig}
-AC_SUBST(TCL_INCLUDE_SPEC)
-AC_SUBST(TCL_LIB_SPEC)
-AC_SUBST(TCL_STUB_LIB_SPEC)
-# There are lots of other configuration variables that are provided by the
-# tclConfig.sh file and that could be included here.  But as of right now,
-# TCL_LIB_SPEC is the only what that the Makefile uses.
-
+AC_SUBST(HAVE_TCL)
 if test x"$TCLSH_CMD" == x; then
  TCLSH_CMD=${TCL_EXEC_PREFIX}/bin/tclsh${TCL_VERSION}
  if test ! -x ${TCLSH_CMD}; then
@@ -198,12 +208,8 @@ if test "$TCLSH_CMD" = "none"; then
  AC_MSG_WARN([Warning: can't find tclsh - defaulting to non-amalgamation build.])
  USE_AMALGAMATION=0
  TCLSH_CMD="tclsh"
-  HAVE_TCL=0
-else
-  HAVE_TCL=1
 fi
 AC_SUBST(TCLSH_CMD)
-AC_SUBST(HAVE_TCL)

 AC_ARG_VAR([TCLLIBDIR], [Where to install tcl plugin])
 if test "x${TCLLIBDIR+set}" != "xset" ; then
--- a/16
+++ b/16
@@ -1,5 +1,5 @@
-C Doc\stypo\scorrection\sreported\sin\sthe\sforum.
-D 2024-08-14T20:00:03.801
+C Reinstate\sthe\s--disable-tcl\soption\son\s./configure.\n[forum:/forumpost/845d4a57becc7f3c|Forum\sthread\s845d4a57becc7f3c].
+D 2024-08-15T15:23:33.404
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -35,8 +35,8 @@ F autoconf/tea/win/nmakehlp.c b01f822eabbe1ed2b64e70882d97d48402b42d2689a1ea0034
 F autoconf/tea/win/rules.vc 7b3bb2ef32ade0f3f14d951231811678722725e3bca240dd9727ae0dfe10f6a5
 F config.guess 883205ddf25b46f10c181818bf42c09da9888884af96f79e1719264345053bd6
 F config.sub c2d0260f17f3e4bc0b6808fccf1b291cb5e9126c14fc5890efc77b9fd0175559
-F configure 8c74221e3e3af939270c27f0600281a5485ac2e5014dd7581b056e24a528d625 x
-F configure.ac 9a3d92b38ad56456d09c1272f83131794f73110437f0f53fb94c90ce0d7a351a
+F configure 6255dfc962e2e5ed0a16ccc5aa39444f693692721ffe1d365ba091d8fe21c7e2 x
+F configure.ac bce81466694af143776724dd483cbc9e1f1288e41d2d0f46e56965be3deacfc5
 F contrib/sqlitecon.tcl 210a913ad63f9f991070821e599d600bd913e0ad
 F doc/F2FS.txt c1d4a0ae9711cfe0e1d8b019d154f1c29e0d3abfe820787ba1e9ed7691160fcd
 F doc/compile-for-windows.md e8635eea9153dcd6a51fd2740666ebc4492b3813cb1ac31cd8e99150df91762d
@@ -2204,8 +2204,8 @@ F vsixtest/vsixtest.tcl 6195aba1f12a5e10efc2b8c0009532167be5e301abe5b31385638080
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 0ce609103eb35cfa26d9b6fa1769679be7e2b9032c37cc8c00a194fe355b06a4
-R 4c6d39820af9105b6fe92615708e9032
-U stephan
-Z 73f13f9927a4c31a02bcb28fc941f7df
+P 48900a867cc4b6d733d2a3533a553af3dfadf96d3ef7ddf4c72bd432e7bf0f76
+R 13d05cfcaef8f5c3cbdcd475a1199700
+U drh
+Z 4a60d69549ab00c925ad79ae1e45201c
 # Remove this line to create a well-formed Fossil manifest.
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-48900a867cc4b6d733d2a3533a553af3dfadf96d3ef7ddf4c72bd432e7bf0f76
+de927016aadd7ee55d947134e3540907a3ea5ab4015034c5d088e3a84905d98a