diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2023-07-11 09:23:33 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2023-07-11 09:23:33 (GMT) |
| commit | cd97018033e773481b8a5b71645a3560e14daca6 (patch) | |
| tree | 5713308dfa4d3a5a5a5a468864510168403c2488 | |
| parent | 7aa511f93b41b7f368922dc00dd94f1919bdaa63 (diff) | |
| parent | 531cd741e0e6f868d67f53b9199ea99535516a28 (diff) | |
| download | tcl-cd97018033e773481b8a5b71645a3560e14daca6.zip tcl-cd97018033e773481b8a5b71645a3560e14daca6.tar.gz tcl-cd97018033e773481b8a5b71645a3560e14daca6.tar.bz2 | |
Merge 8.7
| -rwxr-xr-x | unix/configure | 6 | ||||
| -rw-r--r-- | unix/configure.ac | 2 | ||||
| -rw-r--r-- | unix/tcl.pc.in | 4 |
3 files changed, 10 insertions, 2 deletions
diff --git a/unix/configure b/unix/configure index 3f93ef3..a3102b8 100755 --- a/unix/configure +++ b/unix/configure @@ -737,6 +737,8 @@ RANLIB TOMMATH_INCLUDE TOMMATH_SRCS TOMMATH_OBJS +TCL_PC_CFLAGS +TCL_PC_REQUIRES_PRIVATE ZLIB_INCLUDE ZLIB_SRCS ZLIB_OBJS @@ -5139,6 +5141,10 @@ fi if test $libtommath_ok = yes then : + TCL_PC_REQUIRES_PRIVATE='libtommath >= 1.2.0,' + + TCL_PC_CFLAGS='-DTCL_WITH_EXTERNAL_TOMMATH' + printf "%s\n" "#define TCL_WITH_EXTERNAL_TOMMATH 1" >>confdefs.h diff --git a/unix/configure.ac b/unix/configure.ac index f7538c3..58f5f41 100644 --- a/unix/configure.ac +++ b/unix/configure.ac @@ -185,6 +185,8 @@ if test x"${libtommath_ok}" = x -o x"${libtommath_ok}" != xno; then libtommath_ok=no])]) fi AS_IF([test $libtommath_ok = yes], [ + AC_SUBST(TCL_PC_REQUIRES_PRIVATE, ['libtommath >= 1.2.0,']) + AC_SUBST(TCL_PC_CFLAGS, ['-DTCL_WITH_EXTERNAL_TOMMATH']) AC_DEFINE(TCL_WITH_EXTERNAL_TOMMATH, 1, [Tcl with external libtommath]) ], [ AC_SUBST(TOMMATH_OBJS,[\${TOMMATH_OBJS}]) diff --git a/unix/tcl.pc.in b/unix/tcl.pc.in index 5f90c41..9c6da82 100644 --- a/unix/tcl.pc.in +++ b/unix/tcl.pc.in @@ -10,7 +10,7 @@ Name: Tool Command Language Description: Tcl is a powerful, easy-to-learn dynamic programming language, suitable for a wide range of uses. URL: https://www.tcl-lang.org/ Version: @TCL_VERSION@@TCL_PATCH_LEVEL@ -Requires.private: zlib >= 1.2.3, libtommath >= 1.2.0 +Requires.private: @TCL_PC_REQUIRES_PRIVATE@ zlib >= 1.2.3 Libs: -L${libdir} @TCL_LIB_FLAG@ @TCL_STUB_LIB_FLAG@ Libs.private: @TCL_LIBS@ -Cflags: -I${includedir} +Cflags: -I${includedir} @TCL_PC_CFLAGS@ |