From 531cd741e0e6f868d67f53b9199ea99535516a28 Mon Sep 17 00:00:00 2001 From: "jan.nijtmans" Date: Tue, 11 Jul 2023 09:20:52 +0000 Subject: Fix [5916e48806]: tcl.pc: hardcoded depedencies, missing build flags --- unix/configure | 6 ++++++ unix/configure.ac | 2 ++ unix/tcl.pc.in | 4 ++-- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/unix/configure b/unix/configure index e1623fe..f314fb8 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 653a203..5afa736 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@ -- cgit v0.12