texlive[69194] Build/source/texk/lcdf-typetools: unquote m4 variable
commits+karl at tug.org
commits+karl at tug.org
Fri Dec 22 03:16:39 CET 2023
Revision: 69194
https://tug.org/svn/texlive?view=revision&revision=69194
Author: karl
Date: 2023-12-22 03:16:38 +0100 (Fri, 22 Dec 2023)
Log Message:
-----------
unquote m4 variable to avoid HAVE_AUTO_CFFTOT1_... run-in in autoconf.h.in; use m4_foreach_w instead of obsolete AC_FOREACH
Modified Paths:
--------------
trunk/Build/source/texk/lcdf-typetools/ChangeLog
trunk/Build/source/texk/lcdf-typetools/ac/lcdf-typetools.ac
trunk/Build/source/texk/lcdf-typetools/autoconf.h.in
trunk/Build/source/texk/lcdf-typetools/configure
trunk/Build/source/texk/lcdf-typetools/configure.ac
Property Changed:
----------------
trunk/Build/source/texk/lcdf-typetools/ac/lcdf-typetools.ac
Modified: trunk/Build/source/texk/lcdf-typetools/ChangeLog
===================================================================
--- trunk/Build/source/texk/lcdf-typetools/ChangeLog 2023-12-22 00:43:17 UTC (rev 69193)
+++ trunk/Build/source/texk/lcdf-typetools/ChangeLog 2023-12-22 02:16:38 UTC (rev 69194)
@@ -1,5 +1,17 @@
2023-12-21 Karl Berry <karl at freefriends.org>
+ * configure.ac: do not [quote] kpse_otftotfm_auto_opts,
+ to avoid running together
+ HAVE_AUTO_CFFTOT1_T1DOTLESSJ_TTFTOTYPE42_UPDMAP
+ in autoconf.h.in, which ultimately causes tfm.test to fail.
+ See thread starting at:
+ https://lists.gnu.org/archive/html/bug-autoconf/2023-12/msg00166.html
+ Original lcdf-typetools-src/configure.ac does not quote it, either.
+ * ac/lcdf-typetools.ac: use m4_foreach_w instead of the obsolete
+ AC_FOREACH.
+
+2023-12-21 Karl Berry <karl at freefriends.org>
+
* configure.ac (AC_CONFIG_FILES): write out all the
<subdir>/Makefile values separately (as the original configure.ac
does), instead of using an m4_foreach_w loop. Automake has given
Modified: trunk/Build/source/texk/lcdf-typetools/ac/lcdf-typetools.ac
===================================================================
--- trunk/Build/source/texk/lcdf-typetools/ac/lcdf-typetools.ac 2023-12-22 00:43:17 UTC (rev 69193)
+++ trunk/Build/source/texk/lcdf-typetools/ac/lcdf-typetools.ac 2023-12-22 02:16:38 UTC (rev 69194)
@@ -1,14 +1,18 @@
-## Define configure options for lcdf-typetools. Extracted from configure.ac
-## for ease of building TeX Live.
+dnl $Id$
+# Define configure options for lcdf-typetools. Extracted from configure.ac
+# for ease of building TeX Live.
+#
m4_define_default([kpse_indent_26], [26])[]dnl
+#
m4_define([kpse_lcdf_typetools_progs], [cfftot1 mmafm mmpfb otfinfo otftotfm t1dotlessj t1lint t1rawafm t1reencode t1testpage ttftotype42])[]dnl
-AC_FOREACH([Kpse_Prog], kpse_lcdf_typetools_progs,
+m4_foreach_w([Kpse_Prog], kpse_lcdf_typetools_progs,
[AC_ARG_ENABLE(Kpse_Prog,
AS_HELP_STRING([--disable-]Kpse_Prog,
[do not build the ]Kpse_Prog[ program],
kpse_indent_26))])
+#
m4_define([kpse_otftotfm_auto_opts], [cfftot1 t1dotlessj ttftotype42 updmap])[]dnl
-AC_FOREACH([Kpse_Opt], kpse_otftotfm_auto_opts,
+m4_foreach_w([Kpse_Opt], kpse_otftotfm_auto_opts,
[AC_ARG_ENABLE(Kpse_Opt,
AS_HELP_STRING([--disable-auto-]Kpse_Opt,
[disable running ]Kpse_Opt[ from otftotfm],
Property changes on: trunk/Build/source/texk/lcdf-typetools/ac/lcdf-typetools.ac
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Date Author Id Revision
\ No newline at end of property
Modified: trunk/Build/source/texk/lcdf-typetools/autoconf.h.in
===================================================================
--- trunk/Build/source/texk/lcdf-typetools/autoconf.h.in 2023-12-22 00:43:17 UTC (rev 69193)
+++ trunk/Build/source/texk/lcdf-typetools/autoconf.h.in 2023-12-22 02:16:38 UTC (rev 69194)
@@ -12,7 +12,7 @@
/* Define if the va_list type is addressable. */
#undef HAVE_ADDRESSABLE_VA_LIST
-/* Define to incldue Adobe code in output fonts. */
+/* Define to include Adobe code in output fonts. */
#undef HAVE_ADOBE_CODE
/* Define to 1 if you have the <arpa/inet.h> header file. */
Modified: trunk/Build/source/texk/lcdf-typetools/configure
===================================================================
--- trunk/Build/source/texk/lcdf-typetools/configure 2023-12-22 00:43:17 UTC (rev 69193)
+++ trunk/Build/source/texk/lcdf-typetools/configure 2023-12-22 02:16:38 UTC (rev 69194)
@@ -14860,83 +14860,6 @@
fi
-# Autoupdate added the next two lines to ensure that your configure
-# script's behavior did not change. They are probably safe to remove.
-
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
-printf %s "checking for egrep... " >&6; }
-if test ${ac_cv_path_EGREP+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
- if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
- then ac_cv_path_EGREP="$GREP -E"
- else
- if test -z "$EGREP"; then
- ac_path_EGREP_found=false
- # Loop through the user's path and test for each of PROGNAME-LIST
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-do
- IFS=$as_save_IFS
- case $as_dir in #(((
- '') as_dir=./ ;;
- */) ;;
- *) as_dir=$as_dir/ ;;
- esac
- for ac_prog in egrep
- do
- for ac_exec_ext in '' $ac_executable_extensions; do
- ac_path_EGREP="$as_dir$ac_prog$ac_exec_ext"
- as_fn_executable_p "$ac_path_EGREP" || continue
-# Check for GNU ac_path_EGREP and select it if it is found.
- # Check for GNU $ac_path_EGREP
-case `"$ac_path_EGREP" --version 2>&1` in
-*GNU*)
- ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
-*)
- ac_count=0
- printf %s 0123456789 >"conftest.in"
- while :
- do
- cat "conftest.in" "conftest.in" >"conftest.tmp"
- mv "conftest.tmp" "conftest.in"
- cp "conftest.in" "conftest.nl"
- printf "%s\n" 'EGREP' >> "conftest.nl"
- "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
- diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
- as_fn_arith $ac_count + 1 && ac_count=$as_val
- if test $ac_count -gt ${ac_path_EGREP_max-0}; then
- # Best one so far, save it but keep looking for a better one
- ac_cv_path_EGREP="$ac_path_EGREP"
- ac_path_EGREP_max=$ac_count
- fi
- # 10*(2^10) chars as input seems more than enough
- test $ac_count -gt 10 && break
- done
- rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
- $ac_path_EGREP_found && break 3
- done
- done
- done
-IFS=$as_save_IFS
- if test -z "$ac_cv_path_EGREP"; then
- as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
- fi
-else
- ac_cv_path_EGREP=$EGREP
-fi
-
- fi
-fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
-printf "%s\n" "$ac_cv_path_EGREP" >&6; }
- EGREP="$ac_cv_path_EGREP"
-
-
-
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether closedir returns void" >&5
printf %s "checking whether closedir returns void... " >&6; }
if test ${ac_cv_func_closedir_void+y}
@@ -21055,8 +20978,10 @@
-## Define configure options for lcdf-typetools. Extracted from configure.ac
-## for ease of building TeX Live.
+# Define configure options for lcdf-typetools. Extracted from configure.ac
+# for ease of building TeX Live.
+#
+#
# Check whether --enable-cfftot1 was given.
if test ${enable_cfftot1+y}
then :
@@ -21113,6 +21038,7 @@
enableval=$enable_ttftotype42;
fi
+#
# Check whether --enable-cfftot1 was given.
if test ${enable_cfftot1+y}
then :
@@ -21137,17 +21063,7 @@
SELECTED_SUBDIRS=
-test "x$enable_cfftot1" = xno || SELECTED_SUBDIRS="$SELECTED_SUBDIRS cfftot1"
-test "x$enable_mmafm" = xno || SELECTED_SUBDIRS="$SELECTED_SUBDIRS mmafm"
-test "x$enable_mmpfb" = xno || SELECTED_SUBDIRS="$SELECTED_SUBDIRS mmpfb"
-test "x$enable_otfinfo" = xno || SELECTED_SUBDIRS="$SELECTED_SUBDIRS otfinfo"
-test "x$enable_otftotfm" = xno || SELECTED_SUBDIRS="$SELECTED_SUBDIRS otftotfm"
-test "x$enable_t1dotlessj" = xno || SELECTED_SUBDIRS="$SELECTED_SUBDIRS t1dotlessj"
-test "x$enable_t1lint" = xno || SELECTED_SUBDIRS="$SELECTED_SUBDIRS t1lint"
-test "x$enable_t1rawafm" = xno || SELECTED_SUBDIRS="$SELECTED_SUBDIRS t1rawafm"
-test "x$enable_t1reencode" = xno || SELECTED_SUBDIRS="$SELECTED_SUBDIRS t1reencode"
-test "x$enable_t1testpage" = xno || SELECTED_SUBDIRS="$SELECTED_SUBDIRS t1testpage"
-test "x$enable_ttftotype42" = xno || SELECTED_SUBDIRS="$SELECTED_SUBDIRS ttftotype42"
+test "x$enable_cfftot1 mmafm mmpfb otfinfo otftotfm t1dotlessj t1lint t1rawafm t1reencode t1testpage ttftotype42" = xno || SELECTED_SUBDIRS="$SELECTED_SUBDIRS cfftot1 mmafm mmpfb otfinfo otftotfm t1dotlessj t1lint t1rawafm t1reencode t1testpage ttftotype42"
@@ -23119,23 +23035,8 @@
LCDF_TYPETOOLS_TREE=lcdf-typetools-src
-ac_config_files="$ac_config_files Makefile lcdf-typetools-src/Makefile"
+ac_config_files="$ac_config_files Makefile lcdf-typetools-src/Makefile lcdf-typetools-src/liblcdf/Makefile lcdf-typetools-src/libefont/Makefile lcdf-typetools-src/cfftot1/Makefile lcdf-typetools-src/mmafm/Makefile lcdf-typetools-src/mmpfb/Makefile lcdf-typetools-src/otfinfo/Makefile lcdf-typetools-src/otftotfm/Makefile lcdf-typetools-src/t1dotlessj/Makefile lcdf-typetools-src/t1lint/Makefile lcdf-typetools-src/t1rawafm/Makefile lcdf-typetools-src/t1reencode/Makefile lcdf-typetools-src/t1testpage/Makefile lcdf-typetools-src/ttftotype42/Makefile"
-ac_config_files="$ac_config_files lcdf-typetools-src/liblcdf/Makefile"
-ac_config_files="$ac_config_files lcdf-typetools-src/libefont/Makefile"
-ac_config_files="$ac_config_files lcdf-typetools-src/cfftot1/Makefile"
-ac_config_files="$ac_config_files lcdf-typetools-src/mmafm/Makefile"
-ac_config_files="$ac_config_files lcdf-typetools-src/mmpfb/Makefile"
-ac_config_files="$ac_config_files lcdf-typetools-src/otfinfo/Makefile"
-ac_config_files="$ac_config_files lcdf-typetools-src/otftotfm/Makefile"
-ac_config_files="$ac_config_files lcdf-typetools-src/t1dotlessj/Makefile"
-ac_config_files="$ac_config_files lcdf-typetools-src/t1lint/Makefile"
-ac_config_files="$ac_config_files lcdf-typetools-src/t1rawafm/Makefile"
-ac_config_files="$ac_config_files lcdf-typetools-src/t1reencode/Makefile"
-ac_config_files="$ac_config_files lcdf-typetools-src/t1testpage/Makefile"
-ac_config_files="$ac_config_files lcdf-typetools-src/ttftotype42/Makefile"
-
-
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
# tests run on this system so they can be shared between configure
Modified: trunk/Build/source/texk/lcdf-typetools/configure.ac
===================================================================
--- trunk/Build/source/texk/lcdf-typetools/configure.ac 2023-12-22 00:43:17 UTC (rev 69193)
+++ trunk/Build/source/texk/lcdf-typetools/configure.ac 2023-12-22 02:16:38 UTC (rev 69194)
@@ -300,7 +300,7 @@
])
AC_SUBST(SELECTED_SUBDIRS)
-m4_foreach_w([Kpse_Opt],[kpse_otftotfm_auto_opts],[AS_IF([test "x$enable_auto_]Kpse_Opt[" != xno],
+m4_foreach_w([Kpse_Opt],kpse_otftotfm_auto_opts,[AS_IF([test "x$enable_auto_]Kpse_Opt[" != xno],
[AC_DEFINE([HAVE_AUTO_]AS_TR_CPP(Kpse_Opt), 1,
[Define to run ]Kpse_Opt[ from otftotfm.])])
])
More information about the tex-live-commits
mailing list.