From 7f2c52839db702d4435d62474ea44025f7c2933b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Grubbstr=C3=B6m=20=28Grubba=29?=
<grubba@grubba.org>
Date: Fri, 11 Jan 2008 01:22:27 +0100
Subject: [PATCH] Moved test for libgcc to the module configure scripts, so
that the installed dynamic_module_makefile avoids containing stale values for
it.
Rev: src/aclocal.m4:1.160
Rev: src/configure.in:1.1034
Rev: src/make_variables.in:1.29
Rev: src/modules/dynamic_module_makefile.in:1.124
---
src/aclocal.m4 | 6 ++++--
src/configure.in | 10 ++++------
src/make_variables.in | 4 +++-
src/modules/dynamic_module_makefile.in | 3 +--
4 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/src/aclocal.m4 b/src/aclocal.m4
index 20c719e5bf..7afb21b93e 100644
--- a/src/aclocal.m4
+++ b/src/aclocal.m4
@@ -1,4 +1,4 @@
-dnl $Id: aclocal.m4,v 1.159 2008/01/10 23:22:59 grubba Exp $
+dnl $Id: aclocal.m4,v 1.160 2008/01/11 00:22:27 grubba Exp $
dnl Some compatibility with Autoconf 2.50+. Not complete.
dnl newer Autoconf calls substr m4_substr
@@ -594,7 +594,7 @@ define([PIKE_RETAIN_VARIABLES],
define([AC_LOW_MODULE_INIT],
[
- # $Id: aclocal.m4,v 1.159 2008/01/10 23:22:59 grubba Exp $
+ # $Id: aclocal.m4,v 1.160 2008/01/11 00:22:27 grubba Exp $
MY_AC_PROG_CC
@@ -649,6 +649,8 @@ define([AC_LOW_MODULE_INIT],
fi
fi
AC_SUBST(RUNPIKE)
+
+ PIKE_CHECK_LIBGCC
])
diff --git a/src/configure.in b/src/configure.in
index 90b40a535f..dc85d0d22c 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -1,4 +1,4 @@
-AC_REVISION("$Id: configure.in,v 1.1033 2008/01/10 23:23:16 grubba Exp $")
+AC_REVISION("$Id: configure.in,v 1.1034 2008/01/11 00:22:27 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.1033 2008/01/10 23:23:16 grubba Exp $.
+# Automatically generated by $Id: configure.in,v 1.1034 2008/01/11 00:22:27 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.1033 2008/01/10 23:23:16 grubba Exp $.
+# Automatically generated by $Id: configure.in,v 1.1034 2008/01/11 00:22:27 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.1033 2008/01/10 23:23:16 grubba Exp $.
+# Automatically generated by $Id: configure.in,v 1.1034 2008/01/11 00:22:27 grubba Exp $.
# RNTCL-version. Do NOT edit.
sed -e "$PIKE_PATH_TRANSLATE"
EOF
@@ -7709,8 +7709,6 @@ AC_MSG_RESULT($LINKFORSHARED)
#############################################################################
-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.
# Shared libgcc is nothing but trouble.
diff --git a/src/make_variables.in b/src/make_variables.in
index 4b8d75f099..f05afa5757 100644
--- a/src/make_variables.in
+++ b/src/make_variables.in
@@ -1,6 +1,6 @@
# -*- Makefile -*-
#
-# $Id: make_variables.in,v 1.28 2006/08/03 12:00:42 mast Exp $
+# $Id: make_variables.in,v 1.29 2008/01/11 00:22:27 grubba Exp $
#
# Note: This template is actually used only for make_variables in the
# subdirectories; the one created in the build base dir is just an
@@ -53,4 +53,6 @@ MODNAME=@MODULE_NAME@
MODPATH=@MODULE_PATH@
MODDIR=@MODULE_DIR@
+LIBGCC=@LIBGCC@
+
# End of make_variables.in
diff --git a/src/modules/dynamic_module_makefile.in b/src/modules/dynamic_module_makefile.in
index 7968efa056..1084652426 100644
--- a/src/modules/dynamic_module_makefile.in
+++ b/src/modules/dynamic_module_makefile.in
@@ -1,8 +1,7 @@
#
-# $Id: dynamic_module_makefile.in,v 1.123 2006/08/02 21:19:03 mast Exp $
+# $Id: dynamic_module_makefile.in,v 1.124 2008/01/11 00:22:27 grubba Exp $
#
-LIBGCC=@LIBGCC@
LC_REQ=@LC_REQ@
LINKAGE_CPPFLAGS=
--
GitLab