summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2011-05-05 09:49:45 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2011-05-05 09:49:45 +0000
commit573a4bfca168d1c77325143aa9bb7f39dcf2cd93 (patch)
treef2e0c8fa4841aa9ef93a0302adc57184a342864f /Build
parent067f2d7c97ee4e257067bab915424917fa6a1352 (diff)
zlib: Don't use unsupported visibility attribute
git-svn-id: svn://tug.org/texlive/trunk@22311 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r--Build/source/libs/zlib/ChangeLog4
-rw-r--r--Build/source/libs/zlib/Makefile.in3
-rw-r--r--Build/source/libs/zlib/aclocal.m41
-rwxr-xr-xBuild/source/libs/zlib/configure54
-rw-r--r--Build/source/libs/zlib/configure.ac8
-rw-r--r--Build/source/libs/zlib/include/Makefile.in3
6 files changed, 68 insertions, 5 deletions
diff --git a/Build/source/libs/zlib/ChangeLog b/Build/source/libs/zlib/ChangeLog
index 16867856036..6c8d62e3796 100644
--- a/Build/source/libs/zlib/ChangeLog
+++ b/Build/source/libs/zlib/ChangeLog
@@ -1,3 +1,7 @@
+2011-05-05 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * configure.ac [WIN32]: Don't use visibility attribute.
+
2010-12-07 Peter Breitenlohner <peb@mppmu.mpg.de>
* configure.ac, Makefile.am: Remove obsolete zlib-1.2.3.
diff --git a/Build/source/libs/zlib/Makefile.in b/Build/source/libs/zlib/Makefile.in
index c311d8879f8..332dc40a5a2 100644
--- a/Build/source/libs/zlib/Makefile.in
+++ b/Build/source/libs/zlib/Makefile.in
@@ -46,7 +46,8 @@ DIST_COMMON = README $(am__configure_deps) \
../../build-aux/missing ../../build-aux/texinfo.tex \
../../build-aux/ylwrap ChangeLog
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-win32.m4 \
+ $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
diff --git a/Build/source/libs/zlib/aclocal.m4 b/Build/source/libs/zlib/aclocal.m4
index 76a153698ad..f2dd15ba72f 100644
--- a/Build/source/libs/zlib/aclocal.m4
+++ b/Build/source/libs/zlib/aclocal.m4
@@ -989,3 +989,4 @@ AC_SUBST([am__tar])
AC_SUBST([am__untar])
]) # _AM_PROG_TAR
+m4_include([../../m4/kpse-win32.m4])
diff --git a/Build/source/libs/zlib/configure b/Build/source/libs/zlib/configure
index 05b5caf174d..aad19efe68b 100755
--- a/Build/source/libs/zlib/configure
+++ b/Build/source/libs/zlib/configure
@@ -710,8 +710,7 @@ CFLAGS
LDFLAGS
LIBS
CPPFLAGS
-CPP
-CPPFLAGS'
+CPP'
# Initialize some variables set by options.
@@ -4443,6 +4442,57 @@ $as_echo "no" >&6; }
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for native WIN32 or MINGW32" >&5
+$as_echo_n "checking for native WIN32 or MINGW32... " >&6; }
+if ${kpse_cv_have_win32+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#ifndef WIN32
+ choke me
+#endif
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#ifndef __MINGW32__
+ choke me
+#endif
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ kpse_cv_have_win32=mingw32
+else
+ kpse_cv_have_win32=native
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+else
+ kpse_cv_have_win32=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $kpse_cv_have_win32" >&5
+$as_echo "$kpse_cv_have_win32" >&6; }
+
+if test "x$kpse_cv_have_win32" != xno; then
+ ZLIB_DEFINES="$ZLIB_DEFINES -DNO_VIZ"
+fi
+
+
ZLIB_TREE=zlib-1.2.5
diff --git a/Build/source/libs/zlib/configure.ac b/Build/source/libs/zlib/configure.ac
index fe66357d9d9..9d3ea8c7326 100644
--- a/Build/source/libs/zlib/configure.ac
+++ b/Build/source/libs/zlib/configure.ac
@@ -1,6 +1,6 @@
dnl Process this file with autoconf to produce a configure script.
dnl
-dnl Copyright (C) 2009, 2010 Peter Breitenlohner <tex-live@tug.org>
+dnl Copyright (C) 2009-2011 Peter Breitenlohner <tex-live@tug.org>
dnl
dnl This file is free software; the copyright holder
dnl gives unlimited permission to copy and/or distribute it,
@@ -74,6 +74,12 @@ caddr_t hello() {
[AC_MSG_RESULT([yes])
ZLIB_DEFINES="$ZLIB_DEFINES -DUSE_MMAP"],
[AC_MSG_RESULT([no])])
+
+KPSE_CHECK_WIN32
+if test "x$kpse_cv_have_win32" != xno; then
+ ZLIB_DEFINES="$ZLIB_DEFINES -DNO_VIZ"
+fi
+
AC_SUBST([ZLIB_DEFINES])
ZLIB_TREE=[zlib-]zlib_version
diff --git a/Build/source/libs/zlib/include/Makefile.in b/Build/source/libs/zlib/include/Makefile.in
index 330b7585abb..0e1ba08e7d1 100644
--- a/Build/source/libs/zlib/include/Makefile.in
+++ b/Build/source/libs/zlib/include/Makefile.in
@@ -34,7 +34,8 @@ POST_UNINSTALL = :
subdir = include
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-win32.m4 \
+ $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d