From 99fc5e10f338e668b85288366e03727157f23af5 Mon Sep 17 00:00:00 2001 From: Christopher Faylor Date: Wed, 24 May 2006 16:59:03 +0000 Subject: update to newer autoconf --- winsup/utils/configure.in | 56 +++-------------------------------------------- 1 file changed, 3 insertions(+), 53 deletions(-) (limited to 'winsup/utils/configure.in') diff --git a/winsup/utils/configure.in b/winsup/utils/configure.in index 83d639a02..258c32aec 100644 --- a/winsup/utils/configure.in +++ b/winsup/utils/configure.in @@ -9,58 +9,9 @@ dnl details. dnl Process this file with autoconf to produce a configure script. -AC_PREREQ(2.12) - +AC_PREREQ(2.59) AC_INIT(mount.cc) - -dnl FIXME: We temporarily define our own version of AC_PROG_CC. This is -dnl copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS. We -dnl are probably using a cross compiler, which will not be able to fully -dnl link an executable. This should really be fixed in autoconf -dnl itself. - -AC_DEFUN(LIB_AC_PROG_CC, -[AC_BEFORE([$0], [AC_PROG_CPP])dnl -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 -]) - -AC_DEFUN(LIB_AC_PROG_CXX, -[AC_BEFORE([$0], [AC_PROG_CPP])dnl -AC_CHECK_TOOL(CXX, g++, g++) -if test -z "$CXX"; then - AC_CHECK_PROG(CXX, c++, c++, , , ) - test -z "$CC" && AC_MSG_ERROR([no acceptable cc found in \$PATH]) -fi - -CXXFLAGS='$(CFLAGS)' -]) +AC_CONFIG_AUX_DIR(../..) AC_CANONICAL_SYSTEM @@ -87,6 +38,5 @@ INSTALL="/bin/sh "`cd $srcdir/../..; echo $(pwd)/install-sh -c` AC_PROG_INSTALL -AM_EXEEXT - +AC_EXEEXT AC_OUTPUT(Makefile) -- cgit v1.2.3