diff options
| -rw-r--r-- | apt-pkg/acquire-method.cc | 3 | ||||
| -rw-r--r-- | apt-pkg/contrib/fileutl.cc | 4 | ||||
| -rw-r--r-- | buildlib/configure.mak | 2 | ||||
| -rw-r--r-- | buildlib/tools.m4 | 4 | ||||
| -rw-r--r-- | configure.in | 4 |
5 files changed, 9 insertions, 8 deletions
diff --git a/apt-pkg/acquire-method.cc b/apt-pkg/acquire-method.cc index 55d2b75c7..60b8161e8 100644 --- a/apt-pkg/acquire-method.cc +++ b/apt-pkg/acquire-method.cc @@ -1,6 +1,6 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: acquire-method.cc,v 1.22 1999/11/16 03:16:34 jgg Exp $ +// $Id: acquire-method.cc,v 1.23 1999/12/09 21:18:01 jgg Exp $ /* ###################################################################### Acquire Method @@ -24,6 +24,7 @@ #include <apt-pkg/strutl.h> #include <apt-pkg/fileutl.h> +#include <stdarg.h> #include <stdio.h> #include <unistd.h> /*}}}*/ diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc index ddb07532d..59d6aa50a 100644 --- a/apt-pkg/contrib/fileutl.cc +++ b/apt-pkg/contrib/fileutl.cc @@ -1,6 +1,6 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: fileutl.cc,v 1.31 1999/09/30 06:30:34 jgg Exp $ +// $Id: fileutl.cc,v 1.32 1999/12/09 21:18:01 jgg Exp $ /* ###################################################################### File Utilities @@ -21,8 +21,8 @@ #include <apt-pkg/error.h> #include <unistd.h> +#include <fcntl.h> #include <sys/stat.h> -#include <sys/fcntl.h> #include <sys/types.h> #include <sys/time.h> #include <signal.h> 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}" diff --git a/configure.in b/configure.in index f599b44aa..ff8ab5923 100644 --- a/configure.in +++ b/configure.in @@ -70,7 +70,7 @@ AC_SUBST(PTHREADLIB) dnl Converts the ARCH to be the same as dpkg AC_MSG_CHECKING(system architecture) -archset="`awk '$1 == "'$host_cpu'" { print $2 }' $srcdir/buildlib/archtable`" +archset="`awk '$1 == \"$host_cpu\" { print $2 }' $srcdir/buildlib/archtable`" if test "x$archset" = "x"; then AC_MSG_ERROR(failed: use --host=) fi @@ -85,7 +85,7 @@ AC_CACHE_CHECK([for C9x integer types],c9x_ints,[ dnl Check the sizes etc. of the architecture changequote(,) -if archline="`sed -ne 's/^'$archset':[ ]\+\(.*\)/\1/gp' $srcdir/buildlib/sizetable`"; then +if archline="`grep '^$archset' | cut -f 2- -d ' '`";then changequote([,]) set $archline if test "$1" = "little"; then |