texlive[66135] Build/source/texk: --with-system-potrace support

[commits+karl at tug.org]

Revision: 66135
          http://tug.org/svn/texlive?view=revision&revision=66135
Author:   karl
Date:     2023-02-25 00:44:01 +0100 (Sat, 25 Feb 2023)
Log Message:
-----------
--with-system-potrace support

Modified Paths:
--------------
    trunk/Build/source/configure
    trunk/Build/source/m4/ChangeLog
    trunk/Build/source/m4/kpse-potrace-flags.m4
    trunk/Build/source/texk/dvisvgm/configure
    trunk/Build/source/texk/web2c/configure

Property Changed:
----------------
    trunk/Build/source/m4/kpse-potrace-flags.m4

Modified: trunk/Build/source/configure
===================================================================
--- trunk/Build/source/configure	2023-02-24 23:02:47 UTC (rev 66134)
+++ trunk/Build/source/configure	2023-02-24 23:44:01 UTC (rev 66135)
@@ -22705,12 +22705,14 @@
   as_fn_error $? "did not find PPLIB" "$LINENO" 5
 fi
 
-if $PKG_CONFIG POTRACE; then
-  POTRACE_INCLUDES=`$PKG_CONFIG POTRACE --cflags`
-  POTRACE_LIBS=`$PKG_CONFIG POTRACE --libs`
-elif test "x$need_POTRACE:$with_system_POTRACE" = xyes:yes; then
-  as_fn_error $? "did not find POTRACE" "$LINENO" 5
+##tldbg _KPSE_LIB_FLAGS_SYSTEM: potrace (potrace).
+if test "x$with_potrace_includes" != x && test "x$with_potrace_includes" != xyes; then
+  POTRACE_INCLUDES="-I$with_potrace_includes"
 fi
+POTRACE_LIBS="-lpotrace"
+if test "x$with_potrace_libdir" != x && test "x$with_potrace_libdir" != xyes; then
+  POTRACE_LIBS="-L$with_potrace_libdir $POTRACE_LIBS"
+fi
 
 ##tldbg _KPSE_LIB_FLAGS_SYSTEM: libpaper (paper).
 if test "x$with_libpaper_includes" != x && test "x$with_libpaper_includes" != xyes; then

Modified: trunk/Build/source/m4/ChangeLog
===================================================================
--- trunk/Build/source/m4/ChangeLog	2023-02-24 23:02:47 UTC (rev 66134)
+++ trunk/Build/source/m4/ChangeLog	2023-02-24 23:44:01 UTC (rev 66135)
@@ -1,3 +1,10 @@
+2023-02-25  Werner Fink  <werner at suse.de>
+
+	* kpse-potrace-flags.m4 (KPSE_POTRACE_SYSTEM_FLAGS): define
+	using _KPSE_LIB_FLAGS_SYSTEM since there is no .pc file,
+	to allow --with-system-potrace to work.
+	https://tug.org/pipermail/tex-live/2023-February/048869.html
+
 2022-08-22 Luigi Scarso <luigi.scarso at gmail.com>
 
 	* kpse-pkgs.m4 (KPSE_LIBS_PKGS): add potrace.

Modified: trunk/Build/source/m4/kpse-potrace-flags.m4
===================================================================
--- trunk/Build/source/m4/kpse-potrace-flags.m4	2023-02-24 23:02:47 UTC (rev 66134)
+++ trunk/Build/source/m4/kpse-potrace-flags.m4	2023-02-24 23:44:01 UTC (rev 66135)
@@ -1,5 +1,6 @@
+# $Id$
 # Public macros for the TeX Live (TL) tree.
-# Copyright (C) 2022 Luigi Scarso <tex-live at tug.org>
+# Copyright (C) 2022-2023 Luigi Scarso <tex-live at tug.org>
 #
 # This file is free software; the copyright holder
 # gives unlimited permission to copy and/or distribute it,
@@ -27,5 +28,4 @@
 
 # KPSE_POTRACE_SYSTEM_FLAGS
 # ------------------------
-AC_DEFUN([KPSE_POTRACE_SYSTEM_FLAGS], [dnl
-_KPSE_PKG_CONFIG_FLAGS([POTRACE], [POTRACE])])
+AC_DEFUN([KPSE_POTRACE_SYSTEM_FLAGS], [_KPSE_LIB_FLAGS_SYSTEM([potrace], [potrace])])


Property changes on: trunk/Build/source/m4/kpse-potrace-flags.m4
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Date Author Id Revision
\ No newline at end of property
Modified: trunk/Build/source/texk/dvisvgm/configure
===================================================================
--- trunk/Build/source/texk/dvisvgm/configure	2023-02-24 23:02:47 UTC (rev 66134)
+++ trunk/Build/source/texk/dvisvgm/configure	2023-02-24 23:44:01 UTC (rev 66135)
@@ -23075,12 +23075,14 @@
   withval=$with_potrace_libdir;
 fi
 if test "x$with_system_potrace" = xyes; then
-  if $PKG_CONFIG POTRACE; then
-  POTRACE_INCLUDES=`$PKG_CONFIG POTRACE --cflags`
-  POTRACE_LIBS=`$PKG_CONFIG POTRACE --libs`
-elif test "x$need_POTRACE:$with_system_POTRACE" = xyes:yes; then
-  as_fn_error $? "did not find POTRACE" "$LINENO" 5
+  ##tldbg _KPSE_LIB_FLAGS_SYSTEM: potrace (potrace).
+if test "x$with_potrace_includes" != x && test "x$with_potrace_includes" != xyes; then
+  POTRACE_INCLUDES="-I$with_potrace_includes"
 fi
+POTRACE_LIBS="-lpotrace"
+if test "x$with_potrace_libdir" != x && test "x$with_potrace_libdir" != xyes; then
+  POTRACE_LIBS="-L$with_potrace_libdir $POTRACE_LIBS"
+fi
 else
   POTRACE_INCLUDES="-I$kpse_BLD/libs/potrace/include"
   POTRACE_LIBS="$kpse_BLD/libs/potrace/libpotrace.a"

Modified: trunk/Build/source/texk/web2c/configure
===================================================================
--- trunk/Build/source/texk/web2c/configure	2023-02-24 23:02:47 UTC (rev 66134)
+++ trunk/Build/source/texk/web2c/configure	2023-02-24 23:44:01 UTC (rev 66135)
@@ -27179,12 +27179,14 @@
   withval=$with_potrace_libdir;
 fi
 if test "x$with_system_potrace" = xyes; then
-  if $PKG_CONFIG POTRACE; then
-  POTRACE_INCLUDES=`$PKG_CONFIG POTRACE --cflags`
-  POTRACE_LIBS=`$PKG_CONFIG POTRACE --libs`
-elif test "x$need_POTRACE:$with_system_POTRACE" = xyes:yes; then
-  as_fn_error $? "did not find POTRACE" "$LINENO" 5
+  ##tldbg _KPSE_LIB_FLAGS_SYSTEM: potrace (potrace).
+if test "x$with_potrace_includes" != x && test "x$with_potrace_includes" != xyes; then
+  POTRACE_INCLUDES="-I$with_potrace_includes"
 fi
+POTRACE_LIBS="-lpotrace"
+if test "x$with_potrace_libdir" != x && test "x$with_potrace_libdir" != xyes; then
+  POTRACE_LIBS="-L$with_potrace_libdir $POTRACE_LIBS"
+fi
 else
   POTRACE_INCLUDES="-I$kpse_BLD/libs/potrace/include"
   POTRACE_LIBS="$kpse_BLD/libs/potrace/libpotrace.a"