aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Harring <ferringb@gentoo.org>2004-12-02 02:25:36 +0000
committerBrian Harring <ferringb@gentoo.org>2004-12-02 02:25:36 +0000
commitc5d5197e0db46558eae3b287e74e5f3a1d406e17 (patch)
treed5970bb2c8bbb5f0e8025ac48e3abee568d53a53
parentadjustment so it stops installing a couple of extra srcs to /usr/share. (diff)
downloadsandbox-c5d5197e0db46558eae3b287e74e5f3a1d406e17.tar.gz
sandbox-c5d5197e0db46558eae3b287e74e5f3a1d406e17.tar.bz2
sandbox-c5d5197e0db46558eae3b287e74e5f3a1d406e17.zip
stupid libtool.
Signed-off-by: Brian Harring <ferringb@gentoo.org>
-rw-r--r--ChangeLog5
-rw-r--r--aclocal.m415
2 files changed, 5 insertions, 15 deletions
diff --git a/ChangeLog b/ChangeLog
index d3b01d5..59c222d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,11 @@
# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
# $Header$
+ 01 Dec 2004; Brian Harring <ferringb@gentoo.org> aclocal.m4:
+ Gutted the bugger so it stops checking for a c++ and fortran compiler.
+ Do *not* regenerate aclocal.m4 for making a release until a better
+ solution is created.
+
20 Nov 2004; Brian Harring <ferringb@gentoo.org> Makefile.am, sandbox_futils.c:
Removal of more hardcoded paths.
diff --git a/aclocal.m4 b/aclocal.m4
index b6017d0..05f84de 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -65,9 +65,6 @@ dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both.
# ----------------
AC_DEFUN([_AC_PROG_LIBTOOL],
[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
-AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl
-AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl
-AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl
# This can be used to rebuild libtool when needed
LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
@@ -1729,27 +1726,15 @@ if test -f "$ltmain" && test -n "$tagnames"; then
case $tagname in
CXX)
- if test -n "$CXX" && test "X$CXX" != "Xno"; then
- AC_LIBTOOL_LANG_CXX_CONFIG
- else
tagname=""
- fi
;;
F77)
- if test -n "$F77" && test "X$F77" != "Xno"; then
- AC_LIBTOOL_LANG_F77_CONFIG
- else
tagname=""
- fi
;;
GCJ)
- if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
- AC_LIBTOOL_LANG_GCJ_CONFIG
- else
tagname=""
- fi
;;
RC)