update with upstream.

git-svn-id: https://serveur-svn.lri.fr/svn/modhel/luatex/trunk@7353 0b2b3880-5936-4365-a048-eb17d2e5a6bf
TeX-Live · Apr 26, 2020 · 1237885 · 1237885
1 parent 0d8f479
commit 1237885
Show file tree

Hide file tree

Showing 6 changed files with 61 additions and 14 deletions.
diff --git a/source/libs/pplib/Makefile.am b/source/libs/pplib/Makefile.am
@@ -22,7 +22,7 @@ NEVER_NAMES += $(NEVER_NAMES_SUB) $(NEVER_NAMES_LT)
 
 SUBDIRS = . include
 
-AM_CPPFLAGS = -I$(top_srcdir)/$(PPLIB_TREE)/src -I$(top_srcdir)/$(PPLIB_TREE)/src/util $(PPLIB_DEFINES)
+AM_CPPFLAGS = -I$(top_srcdir)/$(PPLIB_TREE)/src -I$(top_srcdir)/$(PPLIB_TREE)/src/util $(ZLIB_INCLUDES) $(PPLIB_DEFINES)
 AM_CFLAGS = $(WARNING_CFLAGS)  $(PPLIB_CFLAGS)
 
 noinst_LIBRARIES = libpplib.a

diff --git a/source/libs/pplib/Makefile.in b/source/libs/pplib/Makefile.in
@@ -663,7 +663,7 @@ NEVER_NAMES = -name .svn $(NEVER_NAMES_SUB) $(NEVER_NAMES_LT)
 NEVER_NAMES_SUB = -o -name .deps -o -name .dirstamp -o -name '*.$(OBJEXT)'
 NEVER_NAMES_LT = -o -name .libs -o -name '*.lo'
 SUBDIRS = . include
-AM_CPPFLAGS = -I$(top_srcdir)/$(PPLIB_TREE)/src -I$(top_srcdir)/$(PPLIB_TREE)/src/util $(PPLIB_DEFINES)
+AM_CPPFLAGS = -I$(top_srcdir)/$(PPLIB_TREE)/src -I$(top_srcdir)/$(PPLIB_TREE)/src/util $(ZLIB_INCLUDES) $(PPLIB_DEFINES)
 AM_CFLAGS = $(WARNING_CFLAGS)  $(PPLIB_CFLAGS)
 noinst_LIBRARIES = libpplib.a
 nodist_libpplib_a_SOURCES = \

diff --git a/source/libs/pplib/configure b/source/libs/pplib/configure
@@ -13915,6 +13915,36 @@ $as_echo "#define z_const /**/" >>confdefs.h
 esac
 
 
+ if test "x$enable_build" != xno; then
+  build_TRUE=
+  build_FALSE='#'
+else
+  build_TRUE='#'
+  build_FALSE=
+fi
+
+
+if test "x$enable_build" != xno || test -f config.force; then
+
+eval CPPFLAGS=\"$ZLIB_INCLUDES \$CPPFLAGS\"
+eval LIBS=\"$ZLIB_LIBS \$LIBS\"
+
+ac_fn_c_check_func "$LINENO" "zlibVersion" "ac_cv_func_zlibVersion"
+if test "x$ac_cv_func_zlibVersion" = xyes; then :
+
+else
+  as_fn_error $? "zlib not found" "$LINENO" 5
+fi
+
+CPPFLAGS=$kpse_save_CPPFLAGS
+LIBS=$kpse_save_LIBS
+
+
+echo timestamp >config.force
+fi
+
+
+
 if test "x$ac_cv_header_stdc" = xyes; then
   PPLIB_DEFINES="$PPLIB_DEFINES -DHAVE_UNISTD_H"
 fi
@@ -14073,6 +14103,10 @@ if test -z "${build_TRUE}" && test -z "${build_FALSE}"; then
   as_fn_error $? "conditional \"build\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${build_TRUE}" && test -z "${build_FALSE}"; then
+  as_fn_error $? "conditional \"build\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 
 : "${CONFIG_STATUS=./config.status}"
 ac_write_fail=0

diff --git a/source/libs/pplib/configure.ac b/source/libs/pplib/configure.ac
@@ -37,6 +37,19 @@ KPSE_LARGEFILE([PPLIB])
 
 KPSE_ZLIB_FLAGS
 
+AM_CONDITIONAL([build], [test "x$enable_build" != xno])
+
+if test "x$enable_build" != xno || test -f config.force; then
+
+KPSE_ADD_FLAGS([zlib])
+AC_CHECK_FUNC([zlibVersion], , [AC_ERROR([zlib not found])])
+KPSE_RESTORE_FLAGS
+
+echo timestamp >config.force
+fi
+
+
+
 if test "x$ac_cv_header_stdc" = xyes; then
   PPLIB_DEFINES="$PPLIB_DEFINES -DHAVE_UNISTD_H"
 fi

diff --git a/source/texk/web2c/ctangleboot.cin b/source/texk/web2c/ctangleboot.cin
@@ -8,7 +8,7 @@
 #line 83 "cwebdir/ctangle.w"
 
 /*:2*//*6:*/
-#line 52 "cwebdir/comm-w2c.h"
+#line 111 "cwebdir/ctang-w2c.ch"
 
 #ifndef HAVE_GETTEXT
 #define HAVE_GETTEXT 0
@@ -166,7 +166,7 @@
 #line 66 "cwebdir/ctangle.w"
 
 /*5:*/
-#line 37 "cwebdir/comm-w2c.h"
+#line 111 "cwebdir/ctang-w2c.ch"
 
 typedef bool boolean;
 typedef uint8_t eight_bits;
@@ -175,23 +175,23 @@ extern int program;
 extern int phase;
 
 /*:5*//*7:*/
-#line 86 "cwebdir/comm-w2c.h"
+#line 111 "cwebdir/ctang-w2c.ch"
 
 extern char section_text[];
 extern char*section_text_end;
 extern char*id_first;
 extern char*id_loc;
 
 /*:7*//*8:*/
-#line 101 "cwebdir/comm-w2c.h"
+#line 111 "cwebdir/ctang-w2c.ch"
 
 extern char buffer[];
 extern char*buffer_end;
 extern char*loc;
 extern char*limit;
 
 /*:8*//*9:*/
-#line 116 "cwebdir/comm-w2c.h"
+#line 111 "cwebdir/ctang-w2c.ch"
 
 typedef struct name_info{
 char*byte_start;
@@ -225,7 +225,7 @@ extern void print_section_name(name_pointer);
 extern void sprint_section_name(char*,name_pointer);
 
 /*:9*//*10:*/
-#line 157 "cwebdir/comm-w2c.h"
+#line 111 "cwebdir/ctang-w2c.ch"
 
 extern int history;
 extern int wrap_up(void);
@@ -234,7 +234,7 @@ extern void fatal(const char*,const char*);
 extern void overflow(const char*);
 
 /*:10*//*11:*/
-#line 172 "cwebdir/comm-w2c.h"
+#line 111 "cwebdir/ctang-w2c.ch"
 
 extern int include_depth;
 extern FILE*file[];
@@ -258,22 +258,22 @@ extern void check_complete(void);
 extern void reset_input(void);
 
 /*:11*//*12:*/
-#line 195 "cwebdir/comm-w2c.h"
+#line 111 "cwebdir/ctang-w2c.ch"
 
 extern sixteen_bits section_count;
 extern boolean changed_section[];
 extern boolean change_pending;
 extern boolean print_where;
 
 /*:12*//*13:*/
-#line 208 "cwebdir/comm-w2c.h"
+#line 111 "cwebdir/ctang-w2c.ch"
 
 extern int argc;
 extern char**argv;
 extern boolean flags[];
 
 /*:13*//*14:*/
-#line 220 "cwebdir/comm-w2c.h"
+#line 111 "cwebdir/ctang-w2c.ch"
 
 extern FILE*C_file;
 extern FILE*tex_file;
@@ -283,7 +283,7 @@ extern FILE*check_file;
 extern FILE*active_file;
 
 /*:14*//*15:*/
-#line 230 "cwebdir/comm-w2c.h"
+#line 111 "cwebdir/ctang-w2c.ch"
 
 extern void common_init(void);
 extern void print_stats(void);

diff --git a/source/texk/web2c/luatexdir/luatex_svnversion.h b/source/texk/web2c/luatexdir/luatex_svnversion.h
@@ -1 +1 @@
-#define luatex_svn_revision 7347
+#define luatex_svn_revision 7351
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		#define luatex_svn_revision 7347
		#define luatex_svn_revision 7351