diff options
Diffstat (limited to 'zlib')
| -rw-r--r-- | zlib/ChangeLog.gcj | 5 | ||||
| -rw-r--r-- | zlib/Makefile.in | 3 | ||||
| -rw-r--r-- | zlib/aclocal.m4 | 35 | ||||
| -rwxr-xr-x | zlib/configure | 2 |
4 files changed, 10 insertions, 35 deletions
diff --git a/zlib/ChangeLog.gcj b/zlib/ChangeLog.gcj index 0278996..5e77b0e 100644 --- a/zlib/ChangeLog.gcj +++ b/zlib/ChangeLog.gcj @@ -1,3 +1,8 @@ +2005-06-14 Tom Tromey <tromey@redhat.com> + + PR libgcj/19877: + * configure, aclocal.m4, Makefile.in: Rebuilt. + 2005-06-06 Rainer Orth <ro@TechFak.Uni-Bielefeld.DE> * zconf.h (NO_vsnprintf): Define on Tru64 UNIX V4.0. diff --git a/zlib/Makefile.in b/zlib/Makefile.in index ffdcd59..33dabf5 100644 --- a/zlib/Makefile.in +++ b/zlib/Makefile.in @@ -52,7 +52,8 @@ DIST_COMMON = $(srcdir)/../config.guess $(srcdir)/../config.sub README \ $(srcdir)/../config.sub subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/../config/depstand.m4 \ + $(top_srcdir)/../config/lead-dot.m4 $(top_srcdir)/acinclude.m4 \ $(top_srcdir)/../config/no-executables.m4 \ $(top_srcdir)/../libtool.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ diff --git a/zlib/aclocal.m4 b/zlib/aclocal.m4 index e567b3e..be982c2 100644 --- a/zlib/aclocal.m4 +++ b/zlib/aclocal.m4 @@ -547,39 +547,6 @@ AC_DEFUN([AM_PROG_INSTALL_SH], install_sh=${install_sh-"$am_aux_dir/install-sh"} AC_SUBST(install_sh)]) -# -*- Autoconf -*- -# Copyright (C) 2003 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. - -# serial 1 - -# Check whether the underlying file-system supports filenames -# with a leading dot. For instance MS-DOS doesn't. -AC_DEFUN([AM_SET_LEADING_DOT], -[rm -rf .tst 2>/dev/null -mkdir .tst 2>/dev/null -if test -d .tst; then - am__leading_dot=. -else - am__leading_dot=_ -fi -rmdir .tst 2>/dev/null -AC_SUBST([am__leading_dot])]) - # Add --enable-maintainer-mode option to configure. # From Jim Meyering @@ -1127,4 +1094,6 @@ AC_SUBST([am__tar]) AC_SUBST([am__untar]) ]) # _AM_PROG_TAR +m4_include([../config/depstand.m4]) +m4_include([../config/lead-dot.m4]) m4_include([acinclude.m4]) diff --git a/zlib/configure b/zlib/configure index d2046e1..20f35a8 100755 --- a/zlib/configure +++ b/zlib/configure @@ -4432,7 +4432,7 @@ else ac_cv_func_mmap_fixed_mapped=no fi fi -if test "x${ac_cv_func_mmap_fixed_mapped+set}" != xset; then +if test "x${ac_cv_func_mmap_fixed_mapped}" != xno; then echo "$as_me:$LINENO: checking for egrep" >&5 echo $ECHO_N "checking for egrep... $ECHO_C" >&6 |