summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2020-12-03 22:59:23 +0000
committerKarl Berry <karl@freefriends.org>2020-12-03 22:59:23 +0000
commit1e23c61346f5bb93a315c9080d8d1f013f2dc291 (patch)
tree63ce764062dc9ed3175fd64c374f97917fe3cf1e /Build
parent6ef2df7ed6fcfe9b3c8bd82a581b9e2a9a7e237e (diff)
delete AC_HEADER_STDC (will be no-op in next autoconf-2.70) and test of its variable; do not force -O3 if gcc
git-svn-id: svn://tug.org/texlive/trunk@57060 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r--Build/source/libs/zlib/ChangeLog8
-rwxr-xr-xBuild/source/libs/zlib/configure92
-rw-r--r--Build/source/libs/zlib/configure.ac12
3 files changed, 52 insertions, 60 deletions
diff --git a/Build/source/libs/zlib/ChangeLog b/Build/source/libs/zlib/ChangeLog
index 91e20320620..3684349da73 100644
--- a/Build/source/libs/zlib/ChangeLog
+++ b/Build/source/libs/zlib/ChangeLog
@@ -1,3 +1,11 @@
+2020-12-03 Karl Berry <karl@freefriends.org>
+
+ * configure.ac (CFLAGS): do not force -O3 if gcc; there are endless
+ optimization options these days.
+ (AC_HEADER_STDC): remove since it will be a no-op in the upcoming
+ autoconf-2.70, and is presumably not needed; do not explicitly test
+ $ac_cv_header_stdc since it won't be defined.
+
2017-01-15 Akira Kakuto <kakuto@fuk.kindai.ac.jp>
Import zlib-1.2.11.
diff --git a/Build/source/libs/zlib/configure b/Build/source/libs/zlib/configure
index d83f36ec1c4..a5e97686224 100755
--- a/Build/source/libs/zlib/configure
+++ b/Build/source/libs/zlib/configure
@@ -1579,48 +1579,6 @@ fi
} # ac_fn_c_try_cpp
-# ac_fn_c_try_run LINENO
-# ----------------------
-# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
-# that executables *can* be run.
-ac_fn_c_try_run ()
-{
- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- if { { ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
- { { case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; }; then :
- ac_retval=0
-else
- $as_echo "$as_me: program exited with status $ac_status" >&5
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_retval=$ac_status
-fi
- rm -rf conftest.dSYM conftest_ipa8_conftest.oo
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
- as_fn_set_status $ac_retval
-
-} # ac_fn_c_try_run
-
# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
# -------------------------------------------------------
# Tests whether HEADER exists, giving a warning if it cannot be compiled using
@@ -1712,6 +1670,48 @@ fi
} # ac_fn_c_check_header_mongrel
+# ac_fn_c_try_run LINENO
+# ----------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
+# that executables *can* be run.
+ac_fn_c_try_run ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ if { { ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_link") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
+ { { case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; }; then :
+ ac_retval=0
+else
+ $as_echo "$as_me: program exited with status $ac_status" >&5
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_retval=$ac_status
+fi
+ rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_run
+
# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
# -------------------------------------------------------
# Tests whether HEADER exists and can be compiled using the include files in
@@ -4758,10 +4758,6 @@ else
fi
-if test "x$GCC" = xyes; then
- CFLAGS=${CFLAGS-"-O3"}
-fi
-
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -5142,10 +5138,6 @@ $as_echo "#define STDC_HEADERS 1" >>confdefs.h
fi
-if test "x$ac_cv_header_stdc" != xyes; then
- as_fn_error $? "Sorry, can't do anything for you without header_stdc" "$LINENO" 5
-fi
-
# On IRIX 5.3, sys/types and inttypes.h are conflicting.
for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
inttypes.h stdint.h unistd.h
diff --git a/Build/source/libs/zlib/configure.ac b/Build/source/libs/zlib/configure.ac
index a7ac859d7b8..b7e39ef44c7 100644
--- a/Build/source/libs/zlib/configure.ac
+++ b/Build/source/libs/zlib/configure.ac
@@ -1,6 +1,7 @@
+dnl $Id$
dnl Process this file with autoconf to produce a configure script.
dnl
-dnl Copyright (C) 2016 Karl Berry <tex-live@tug.org>
+dnl Copyright (C) 2016-2020 Karl Berry <tex-live@tug.org>
dnl Copyright (C) 2009-2013 Peter Breitenlohner <tex-live@tug.org>
dnl
dnl This file is free software; the copyright holder
@@ -26,15 +27,6 @@ AC_CONFIG_HEADERS([config.h])[]dnl unused, to avoid zillions of -D's on command
AM_CONDITIONAL([build], [test "x$enable_build" != xno])
-if test "x$GCC" = xyes; then
- CFLAGS=${CFLAGS-"-O3"}
-fi
-
-AC_HEADER_STDC
-if test "x$ac_cv_header_stdc" != xyes; then
- AC_MSG_ERROR([Sorry, can't do anything for you without header_stdc])
-fi
-
AC_CHECK_HEADER([errno.h],
[ZLIB_DEFINES=],
[ZLIB_DEFINES="-DNO_ERRNO_H"])