summaryrefslogtreecommitdiff
path: root/buildlib
diff options
context:
space:
mode:
authorArch Librarian <arch@canonical.com>2004-09-20 16:55:21 +0000
committerArch Librarian <arch@canonical.com>2004-09-20 16:55:21 +0000
commit2c206aa41634aa41833463c41bae337e6778e226 (patch)
tree2727b2727d5ff777605cdb5f9f6344a6f757015b /buildlib
parent7c1133fe4559da6bed3bb916660f5b408ffa4705 (diff)
Fixes for Solaris
Author: jgg Date: 1999-12-09 21:18:01 GMT Fixes for Solaris
Diffstat (limited to 'buildlib')
-rw-r--r--buildlib/configure.mak2
-rw-r--r--buildlib/tools.m44
2 files changed, 3 insertions, 3 deletions
diff --git a/buildlib/configure.mak b/buildlib/configure.mak
index 2124ef887..af6c35e38 100644
--- a/buildlib/configure.mak
+++ b/buildlib/configure.mak
@@ -21,7 +21,7 @@ configure: aclocal.m4 configure.in
aclocal.m4:
aclocal -I buildlib
$(BUILDDIR)/config.status: configure
- test -e $(BUILDDIR) || mkdir $(BUILDDIR)
+ /usr/bin/test -e $(BUILDDIR) || mkdir $(BUILDDIR)
(HERE=`pwd`; cd $(BUILDDIR) && $$HERE/configure)
$(addprefix $(BUILDDIR)/,$(CONVERTED)):
(cd $(BUILDDIR) && ./config.status)
diff --git a/buildlib/tools.m4 b/buildlib/tools.m4
index 69a6063c1..88a06dfab 100644
--- a/buildlib/tools.m4
+++ b/buildlib/tools.m4
@@ -102,7 +102,7 @@ if test -z "$CC"; then
fi
if test -n "$ac_tool_prefix" -a "`echo $CC | grep '$ac_tool_prefix'`" = "" \
-a "`echo $CC | grep -- '-b'`" = ""; then
- if test -z "$ac_cv_prog_CC_dir" && $CC -v 2>&1 | grep -q gcc; then
+ if test -z "$ac_cv_prog_CC_dir" && $CC -v 2>&1 | grep gcc >/dev/null 2>&1 ; then
AC_CACHE_CHECK([if $CC -b${ac_tool_dir} works], tl_cv_prog_cc_bhost,[
old_cc="${CC}"
CC="${CC} -b${ac_tool_dir}"
@@ -153,7 +153,7 @@ tl_CHECK_TOOLS(CXX, $CCC c++ g++ gcc CC cxx cc++, gcc)
if test -n "$CXX"; then
if test -n "$ac_tool_prefix" -a "`echo $CXX | grep '$ac_tool_prefix'`" = "" \
-a "`echo $CXX | grep -- '-b'`" = ""; then
- if test -z "$ac_cv_prog_CXX_dir" && $CXX -v 2>&1 | grep -q gcc; then
+ if test -z "$ac_cv_prog_CXX_dir" && $CXX -v 2>&1 | grep gcc >/dev/null 2>&1; then
AC_CACHE_CHECK([if $CXX -b${ac_tool_dir} works], tl_cv_prog_cxx_bhost,[
old_cxx="${CXX}"
CXX="${CXX} -b${ac_tool_dir}"