--with-system-potrace support

git-svn-id: svn://tug.org/texlive/trunk@66135 c570f23f-e606-0410-a88d-b1316a301751

5 files changed, 31 insertions, 18 deletions

diff --git a/Build/source/configure b/Build/source/configure
index 91cb5dd65a7..c15716282d5 100755
--- a/Build/source/configure
+++ b/Build/source/configure
@@ -22705,11 +22705,13 @@ elif test "x$need_PPLIB:$with_system_PPLIB" = xyes:yes; then
   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).
diff --git a/Build/source/m4/ChangeLog b/Build/source/m4/ChangeLog
index facc649163e..5f2b5ab3fdc 100644
--- a/Build/source/m4/ChangeLog
+++ b/Build/source/m4/ChangeLog
@@ -1,3 +1,10 @@
+2023-02-25  Werner Fink  <werner@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@gmail.com>
 
 	* kpse-pkgs.m4 (KPSE_LIBS_PKGS): add potrace.
diff --git a/Build/source/m4/kpse-potrace-flags.m4 b/Build/source/m4/kpse-potrace-flags.m4
index 5d24df9ae3b..710f9ebdfd7 100644
--- a/Build/source/m4/kpse-potrace-flags.m4
+++ b/Build/source/m4/kpse-potrace-flags.m4
@@ -1,5 +1,6 @@
+# $Id$
 # Public macros for the TeX Live (TL) tree.
-# Copyright (C) 2022 Luigi Scarso <tex-live@tug.org>
+# Copyright (C) 2022-2023 Luigi Scarso <tex-live@tug.org>
 #
 # This file is free software; the copyright holder
 # gives unlimited permission to copy and/or distribute it,
@@ -27,5 +28,4 @@ AC_DEFUN([KPSE_POTRACE_OPTIONS], [_KPSE_LIB_OPTIONS([potrace], [$1])])
 
 # 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])])
diff --git a/Build/source/texk/dvisvgm/configure b/Build/source/texk/dvisvgm/configure
index 3b97eb97f1b..7ae811c858b 100755
--- a/Build/source/texk/dvisvgm/configure
+++ b/Build/source/texk/dvisvgm/configure
@@ -23075,11 +23075,13 @@ then :
   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"
diff --git a/Build/source/texk/web2c/configure b/Build/source/texk/web2c/configure
index 92daef31631..e9b8c6e4219 100755
--- a/Build/source/texk/web2c/configure
+++ b/Build/source/texk/web2c/configure
@@ -27179,11 +27179,13 @@ then :
   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"