diff --git a/src/aclocal.m4 b/src/aclocal.m4 index b0365f8c4e80659209e46a3b1ba1dd09129cbc56..20c719e5bf2b72c3d82853a388ea1ae7696e7eda 100644 --- a/src/aclocal.m4 +++ b/src/aclocal.m4 @@ -1,4 +1,4 @@ -dnl $Id: aclocal.m4,v 1.158 2007/07/06 15:54:49 grubba Exp $ +dnl $Id: aclocal.m4,v 1.159 2008/01/10 23:22:59 grubba Exp $ dnl Some compatibility with Autoconf 2.50+. Not complete. dnl newer Autoconf calls substr m4_substr @@ -135,6 +135,43 @@ pushdef([AC_PROG_CC], fi ]) +# Check for libgcc. +define([PIKE_CHECK_LIBGCC],[ + if test $ac_cv_prog_gcc = yes; then + AC_MSG_CHECKING(for libgcc file name) + if test -f "$pike_cv_libgcc_filename"; then :; else + # libgcc has gone away probably due to gcc having been upgraded. + # Invalidate the entry. + unset pike_cv_libgcc_filename + fi + AC_CACHE_VAL(pike_cv_libgcc_filename, + [ + pike_cv_libgcc_filename="`${CC-cc} $CCSHARED -print-libgcc-file-name`" + if test -z "$pike_cv_libgcc_filename"; then + pike_cv_libgcc_filename=no + else + if test -f "$pike_cv_libgcc_filename"; then + pic_name=`echo "$pike_cv_libgcc_filename"|sed -e 's/\.a$/_pic.a/'` + if test -f "$pic_name"; then + pike_cv_libgcc_filename="$pic_name" + fi + else + pike_cv_libgcc_filename=no + fi + fi + ]) + AC_MSG_RESULT($pike_cv_libgcc_filename) + if test x"$pike_cv_libgcc_filename" = xno; then + LIBGCC="" + else + LIBGCC="$pike_cv_libgcc_filename" + fi + else + LIBGCC="" + fi + AC_SUBST(LIBGCC) +]) + dnl Like AC_PATH_PROG but if $2 isn't found and $RNTANY is set, tries dnl to execute "$RNTANY $2 /?" and defines $1 to "$RNTANY $2" if that dnl succeeds. @@ -557,7 +594,7 @@ define([PIKE_RETAIN_VARIABLES], define([AC_LOW_MODULE_INIT], [ - # $Id: aclocal.m4,v 1.158 2007/07/06 15:54:49 grubba Exp $ + # $Id: aclocal.m4,v 1.159 2008/01/10 23:22:59 grubba Exp $ MY_AC_PROG_CC diff --git a/src/configure.in b/src/configure.in index 0fbb0eaba1d3f64b3a683064e107d0a75958b1af..90b40a535f0a5a6c70fee7c16b17323ffabca04d 100644 --- a/src/configure.in +++ b/src/configure.in @@ -1,4 +1,4 @@ -AC_REVISION("$Id: configure.in,v 1.1032 2007/12/26 23:06:08 grubba Exp $") +AC_REVISION("$Id: configure.in,v 1.1033 2008/01/10 23:23:16 grubba Exp $") AC_INIT(interpret.c) AC_CONFIG_HEADER(machine.h) @@ -2327,7 +2327,7 @@ if test "x$PIKE_PATH_TRANSLATE" = "x"; then # MinGW system. cat <<\EOF #!/bin/sh -# Automatically generated by $Id: configure.in,v 1.1032 2007/12/26 23:06:08 grubba Exp $. +# Automatically generated by $Id: configure.in,v 1.1033 2008/01/10 23:23:16 grubba Exp $. # MinGW-version. Do NOT edit. posix_name="`cat`" posix_prefix="/" @@ -2365,7 +2365,7 @@ EOF # Native POSIX system. cat <<\EOF #!/bin/sh -# Automatically generated by $Id: configure.in,v 1.1032 2007/12/26 23:06:08 grubba Exp $. +# Automatically generated by $Id: configure.in,v 1.1033 2008/01/10 23:23:16 grubba Exp $. # POSIX-version. Do NOT edit. cat EOF @@ -2374,7 +2374,7 @@ else # rntcl-style cat <<\EOF #!/bin/sh -# Automatically generated by $Id: configure.in,v 1.1032 2007/12/26 23:06:08 grubba Exp $. +# Automatically generated by $Id: configure.in,v 1.1033 2008/01/10 23:23:16 grubba Exp $. # RNTCL-version. Do NOT edit. sed -e "$PIKE_PATH_TRANSLATE" EOF @@ -7709,39 +7709,7 @@ AC_MSG_RESULT($LINKFORSHARED) ############################################################################# -if test $ac_cv_prog_gcc = yes; then - AC_MSG_CHECKING(for libgcc file name) - if test -f "$pike_cv_libgcc_filename"; then :; else - # libgcc has gone away probably due to gcc having been upgraded. - # Invalidate the entry. - unset pike_cv_libgcc_filename - fi - AC_CACHE_VAL(pike_cv_libgcc_filename, - [ - pike_cv_libgcc_filename="`${CC-cc} $CCSHARED -print-libgcc-file-name`" - if test -z "$pike_cv_libgcc_filename"; then - pike_cv_libgcc_filename=no - else - if test -f "$pike_cv_libgcc_filename"; then - pic_name=`echo "$pike_cv_libgcc_filename"|sed -e 's/\.a$/_pic.a/'` - if test -f "$pic_name"; then - pike_cv_libgcc_filename="$pic_name" - fi - else - pike_cv_libgcc_filename=no - fi - fi - ]) - AC_MSG_RESULT($pike_cv_libgcc_filename) - if test x"$pike_cv_libgcc_filename" = xno; then - LIBGCC="" - else - LIBGCC="$pike_cv_libgcc_filename" - fi -else - LIBGCC="" -fi -AC_SUBST(LIBGCC) +PIKE_CHECK_LIBGCC # In case we're going to use gcc for linking shared objects, # we should use the -static-libgcc flag if it exists.