texlive[54901] Build/source: pplib under libs: add zlib cflags

commits+lscarso at tug.org commits+lscarso at tug.org
Mon Apr 27 00:29:50 CEST 2020


Revision: 54901
          http://tug.org/svn/texlive?view=revision&revision=54901
Author:   lscarso
Date:     2020-04-27 00:29:50 +0200 (Mon, 27 Apr 2020)
Log Message:
-----------
pplib under libs: add zlib cflags

Modified Paths:
--------------
    trunk/Build/source/libs/pplib/Makefile.am
    trunk/Build/source/libs/pplib/Makefile.in
    trunk/Build/source/libs/pplib/configure
    trunk/Build/source/libs/pplib/configure.ac
    trunk/Build/source/texk/web2c/luatexdir/luatex_svnversion.h

Modified: trunk/Build/source/libs/pplib/Makefile.am
===================================================================
--- trunk/Build/source/libs/pplib/Makefile.am	2020-04-26 21:44:23 UTC (rev 54900)
+++ trunk/Build/source/libs/pplib/Makefile.am	2020-04-26 22:29:50 UTC (rev 54901)
@@ -22,7 +22,7 @@
 
 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

Modified: trunk/Build/source/libs/pplib/Makefile.in
===================================================================
--- trunk/Build/source/libs/pplib/Makefile.in	2020-04-26 21:44:23 UTC (rev 54900)
+++ trunk/Build/source/libs/pplib/Makefile.in	2020-04-26 22:29:50 UTC (rev 54901)
@@ -663,7 +663,7 @@
 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 = \

Modified: trunk/Build/source/libs/pplib/configure
===================================================================
--- trunk/Build/source/libs/pplib/configure	2020-04-26 21:44:23 UTC (rev 54900)
+++ trunk/Build/source/libs/pplib/configure	2020-04-26 22:29:50 UTC (rev 54901)
@@ -13915,6 +13915,36 @@
 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 @@
   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

Modified: trunk/Build/source/libs/pplib/configure.ac
===================================================================
--- trunk/Build/source/libs/pplib/configure.ac	2020-04-26 21:44:23 UTC (rev 54900)
+++ trunk/Build/source/libs/pplib/configure.ac	2020-04-26 22:29:50 UTC (rev 54901)
@@ -37,6 +37,19 @@
 
 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

Modified: trunk/Build/source/texk/web2c/luatexdir/luatex_svnversion.h
===================================================================
--- trunk/Build/source/texk/web2c/luatexdir/luatex_svnversion.h	2020-04-26 21:44:23 UTC (rev 54900)
+++ trunk/Build/source/texk/web2c/luatexdir/luatex_svnversion.h	2020-04-26 22:29:50 UTC (rev 54901)
@@ -1 +1 @@
-#define luatex_svn_revision 7333
+#define luatex_svn_revision 7353



More information about the tex-live-commits mailing list.