Skip to content

R
riscv-gcc-1
Commit a8aea176 by Nathanael Nerode
Options

configure.in: Update to autoconf 2.59; clean up slightly. 

2004-04-09  Nathanael Nerode  <neroden@gcc.gnu.org>

	* configure.in: Update to autoconf 2.59; clean up slightly.
	* acinclude.m4: Update to autoconf 2.59.
	* aclocal.m4: Regenerate.
	* Makefile.in: Regenerate.
	* configure: Regenerate.

From-SVN: r80544
parent be912515
Showing with 36 additions and 110 deletions
zlib/ChangeLog.gcj
2004-04-09 Nathanael Nerode <neroden@gcc.gnu.org>
* configure.in: Update to autoconf 2.59; clean up slightly.
* acinclude.m4: Update to autoconf 2.59.
* aclocal.m4: Regenerate.
* Makefile.in: Regenerate.
* configure: Regenerate.
2004-01-14 Kelley Cook <kcook@gcc.gnu.org> 2004-01-14 Kelley Cook <kcook@gcc.gnu.org>
* configure.in: Add in AC_PREREQ(2.13) * configure.in: Add in AC_PREREQ(2.13)
......
zlib/Makefile.in
...@@ -189,7 +189,7 @@ aclocal.m4 configure configure.in ...@@ -189,7 +189,7 @@ aclocal.m4 configure configure.in
DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
TAR = gtar TAR = tar
GZIP_ENV = --best GZIP_ENV = --best
SOURCES = $(libz_a_SOURCES) $(libzgcj_convenience_la_SOURCES) SOURCES = $(libz_a_SOURCES) $(libzgcj_convenience_la_SOURCES)
OBJECTS = $(libz_a_OBJECTS) $(libzgcj_convenience_la_OBJECTS) OBJECTS = $(libz_a_OBJECTS) $(libzgcj_convenience_la_OBJECTS)
......
zlib/acinclude.m4
# FIXME: We temporarily define our own version of AC_PROG_CC. This is sinclude(../config/no-executables.m4)
# copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS. We
# are probably using a cross compiler, which will not be able to fully
# link an executable. This should really be fixed in autoconf
# itself.
AC_DEFUN(LIB_AC_PROG_CC,
[AC_BEFORE([$0], [AC_PROG_CPP])dnl
dnl Fool anybody using AC_PROG_CC.
AC_PROVIDE([AC_PROG_CC])
AC_CHECK_PROG(CC, gcc, gcc)
if test -z "$CC"; then
AC_CHECK_PROG(CC, cc, cc, , , /usr/ucb/cc)
test -z "$CC" && AC_MSG_ERROR([no acceptable cc found in \$PATH])
fi
AC_PROG_CC_GNU
if test $ac_cv_prog_gcc = yes; then
GCC=yes
dnl Check whether -g works, even if CFLAGS is set, in case the package
dnl plays around with CFLAGS (such as to build both debugging and
dnl normal versions of a library), tasteless as that idea is.
ac_test_CFLAGS="${CFLAGS+set}"
ac_save_CFLAGS="$CFLAGS"
CFLAGS=
AC_PROG_CC_G
if test "$ac_test_CFLAGS" = set; then
CFLAGS="$ac_save_CFLAGS"
elif test $ac_cv_prog_cc_g = yes; then
CFLAGS="-g -O2"
else
CFLAGS="-O2"
fi
else
GCC=
test "${CFLAGS+set}" = set || CFLAGS="-g"
fi
])
sinclude(../libtool.m4) sinclude(../libtool.m4)
dnl The lines below arrange for aclocal not to bring libtool.m4 dnl The lines below arrange for aclocal not to bring libtool.m4
dnl AM_PROG_LIBTOOL into aclocal.m4, while still arranging for automake dnl AM_PROG_LIBTOOL into aclocal.m4, while still arranging for automake
......
zlib/aclocal.m4
...@@ -10,46 +10,7 @@ dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without ...@@ -10,46 +10,7 @@ dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
dnl PARTICULAR PURPOSE. dnl PARTICULAR PURPOSE.
# FIXME: We temporarily define our own version of AC_PROG_CC. This is sinclude(../config/no-executables.m4)
# copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS. We
# are probably using a cross compiler, which will not be able to fully
# link an executable. This should really be fixed in autoconf
# itself.
AC_DEFUN(LIB_AC_PROG_CC,
[AC_BEFORE([$0], [AC_PROG_CPP])dnl
dnl Fool anybody using AC_PROG_CC.
AC_PROVIDE([AC_PROG_CC])
AC_CHECK_PROG(CC, gcc, gcc)
if test -z "$CC"; then
AC_CHECK_PROG(CC, cc, cc, , , /usr/ucb/cc)
test -z "$CC" && AC_MSG_ERROR([no acceptable cc found in \$PATH])
fi
AC_PROG_CC_GNU
if test $ac_cv_prog_gcc = yes; then
GCC=yes
dnl Check whether -g works, even if CFLAGS is set, in case the package
dnl plays around with CFLAGS (such as to build both debugging and
dnl normal versions of a library), tasteless as that idea is.
ac_test_CFLAGS="${CFLAGS+set}"
ac_save_CFLAGS="$CFLAGS"
CFLAGS=
AC_PROG_CC_G
if test "$ac_test_CFLAGS" = set; then
CFLAGS="$ac_save_CFLAGS"
elif test $ac_cv_prog_cc_g = yes; then
CFLAGS="-g -O2"
else
CFLAGS="-O2"
fi
else
GCC=
test "${CFLAGS+set}" = set || CFLAGS="-g"
fi
])
sinclude(../libtool.m4) sinclude(../libtool.m4)
dnl The lines below arrange for aclocal not to bring libtool.m4 dnl The lines below arrange for aclocal not to bring libtool.m4
dnl AM_PROG_LIBTOOL into aclocal.m4, while still arranging for automake dnl AM_PROG_LIBTOOL into aclocal.m4, while still arranging for automake
......
zlib/configure
This source diff could not be displayed because it is too large. You can view the blob instead.
zlib/configure.in
dnl Process this with autoconf to create configure dnl Process this with autoconf to create configure
AC_PREREQ(2.13) AC_PREREQ(2.59)
AC_INIT(zlib.h) AC_INIT
AC_CONFIG_SRCDIR([zlib.h])
# This works around the fact that libtool configuration may change LD # This works around the fact that libtool configuration may change LD
# for this particular configuration, but some shells, instead of # for this particular configuration, but some shells, instead of
...@@ -44,6 +45,14 @@ dnl We use these options to decide which functions to include. ...@@ -44,6 +45,14 @@ dnl We use these options to decide which functions to include.
AC_ARG_WITH(target-subdir, AC_ARG_WITH(target-subdir,
[ --with-target-subdir=SUBDIR [ --with-target-subdir=SUBDIR
configuring in a subdirectory]) configuring in a subdirectory])
if test -z "$with_target_subdir" || test "$with_target_subdir" = "."; then
COMPPATH=.
else
COMPPATH=..
fi
AC_SUBST(COMPPATH)
AC_ARG_WITH(cross-host, AC_ARG_WITH(cross-host,
[ --with-cross-host=HOST configuring with a cross compiler]) [ --with-cross-host=HOST configuring with a cross compiler])
...@@ -59,29 +68,12 @@ AC_ARG_ENABLE(multilib, ...@@ -59,29 +68,12 @@ AC_ARG_ENABLE(multilib,
AC_ARG_WITH(system-zlib, AC_ARG_WITH(system-zlib,
[ --with-system-zlib use installed libz]) [ --with-system-zlib use installed libz])
LIB_AC_PROG_CC # Make sure we don't test executables when making cross-tools.
# We need AC_EXEEXT to keep automake happy in cygnus mode. However, GCC_NO_EXECUTABLES
# at least currently, we never actually build a program, so we never
# need to use $(EXEEXT). Moreover, the test for EXEEXT normally
# fails, because we are probably configuring with a cross compiler
# which cant create executables. So we include AC_EXEEXT to keep
# automake happy, but we dont execute it, since we dont care about
# the result.
if false; then
# autoconf 2.50 runs AC_EXEEXT by default, and the macro expands
# to nothing, so nothing would remain between `then' and `fi' if it
# were not for the `:' below.
:
AC_EXEEXT
fi
AM_PROG_LIBTOOL
if test -z "$with_target_subdir" || test "$with_target_subdir" = "."; then AC_PROG_CC
COMPPATH=.
else AM_PROG_LIBTOOL
COMPPATH=..
fi
AC_SUBST(COMPPATH)
# Find CPP now so that any conditional tests below won't do it and # Find CPP now so that any conditional tests below won't do it and
# thereby make the resulting definitions conditional. # thereby make the resulting definitions conditional.
...@@ -142,12 +134,14 @@ else ...@@ -142,12 +134,14 @@ else
multilib_arg= multilib_arg=
fi fi
AC_OUTPUT(Makefile, AC_CONFIG_FILES([Makefile])
[if test -n "$CONFIG_FILES"; then
AC_CONFIG_COMMANDS([default],
[[if test -n "$CONFIG_FILES"; then
LD="${ORIGINAL_LD_FOR_MULTILIBS}" LD="${ORIGINAL_LD_FOR_MULTILIBS}"
ac_file=Makefile . ${zlib_basedir}/../config-ml.in ac_file=Makefile . ${zlib_basedir}/../config-ml.in
fi], fi]],
srcdir=${srcdir} [[srcdir=${srcdir}
host=${host} host=${host}
target=${target} target=${target}
with_multisubdir=${with_multisubdir} with_multisubdir=${with_multisubdir}
...@@ -157,4 +151,6 @@ zlib_basedir=${zlib_basedir} ...@@ -157,4 +151,6 @@ zlib_basedir=${zlib_basedir}
CC="${CC}" CC="${CC}"
CXX="${CXX}" CXX="${CXX}"
ORIGINAL_LD_FOR_MULTILIBS="${ORIGINAL_LD_FOR_MULTILIBS}" ORIGINAL_LD_FOR_MULTILIBS="${ORIGINAL_LD_FOR_MULTILIBS}"
) ]])
AC_OUTPUT
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment