From 20564e329c75df41387c677a66d7ab4edbcc3c5e Mon Sep 17 00:00:00 2001 From: Luigi Scarso Date: Sun, 26 Apr 2020 22:29:50 +0000 Subject: pplib under libs: add zlib cflags git-svn-id: svn://tug.org/texlive/trunk@54901 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/libs/pplib/Makefile.am | 2 +- Build/source/libs/pplib/Makefile.in | 2 +- Build/source/libs/pplib/configure | 34 ++++++++++++++++++++++++++++++++++ Build/source/libs/pplib/configure.ac | 13 +++++++++++++ 4 files changed, 49 insertions(+), 2 deletions(-) (limited to 'Build/source/libs/pplib') diff --git a/Build/source/libs/pplib/Makefile.am b/Build/source/libs/pplib/Makefile.am index 4a2154a651b..464aeb1357d 100644 --- a/Build/source/libs/pplib/Makefile.am +++ b/Build/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/Build/source/libs/pplib/Makefile.in b/Build/source/libs/pplib/Makefile.in index 763044fd40e..cd8ca0f23a6 100644 --- a/Build/source/libs/pplib/Makefile.in +++ b/Build/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/Build/source/libs/pplib/configure b/Build/source/libs/pplib/configure index bb6b2777e8c..b88d54148de 100755 --- a/Build/source/libs/pplib/configure +++ b/Build/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/Build/source/libs/pplib/configure.ac b/Build/source/libs/pplib/configure.ac index 8deb254cd3f..634726b7ed4 100644 --- a/Build/source/libs/pplib/configure.ac +++ b/Build/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 -- cgit v1.2.3