diff options
| author | neroden <neroden@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-04-09 10:18:17 +0000 |
|---|---|---|
| committer | neroden <neroden@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-04-09 10:18:17 +0000 |
| commit | f645ebe62cbef8319ce539c0fef2fea5318b8d02 (patch) | |
| tree | 58faef984a563a8bde14477b5ab1beeb653ad085 /zlib/aclocal.m4 | |
| parent | 49aae208df317027c48b7d2ac0fd73c100ba198f (diff) | |
| download | gcc-f645ebe62cbef8319ce539c0fef2fea5318b8d02.tar.gz | |
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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@80544 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'zlib/aclocal.m4')
| -rw-r--r-- | zlib/aclocal.m4 | 41 |
1 files changed, 1 insertions, 40 deletions
diff --git a/zlib/aclocal.m4 b/zlib/aclocal.m4 index eae07e4edaf..fbf3500117f 100644 --- a/zlib/aclocal.m4 +++ b/zlib/aclocal.m4 @@ -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 PARTICULAR PURPOSE. -# FIXME: We temporarily define our own version of AC_PROG_CC. This is -# 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(../config/no-executables.m4) sinclude(../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 |