Index: config.h.in =================================================================== RCS file: /cvs/tools/dmake/config.h.in,v retrieving revision 1.6.10.1 diff -u -b -B -p -r1.6.10.1 config.h.in --- config.h.in 13 Feb 2003 11:55:38 -0000 1.6.10.1 +++ config.h.in 18 Feb 2003 11:48:19 -0000 @@ -99,8 +99,14 @@ /* Define if you have the header file. */ #undef HAVE_SYS_TYPES_H +/* Define if you have the header file. */ +#undef HAVE_SYS_WAIT_H + /* Define if you have the header file. */ #undef HAVE_UNISTD_H /* Define if you have the header file. */ #undef HAVE_UTIME_H + +/* Define if you have the header file. */ +#undef HAVE_WAIT_H Index: configure =================================================================== RCS file: /cvs/tools/dmake/configure,v retrieving revision 1.9.10.1 diff -u -b -B -p -r1.9.10.1 configure --- configure 13 Feb 2003 11:55:38 -0000 1.9.10.1 +++ configure 18 Feb 2003 11:48:23 -0000 @@ -1675,7 +1675,7 @@ EOF fi -for ac_hdr in fcntl.h limits.h strings.h sys/types.h sys/stat.h unistd.h errno.h utime.h spawn.h +for ac_hdr in fcntl.h limits.h strings.h sys/types.h sys/stat.h unistd.h errno.h utime.h spawn.h wait.h sys/wait.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 @@ -2352,64 +2352,6 @@ echo "$ac_t""checked ($_os)" 1>&6 - -echo $ac_n "checking the operating system""... $ac_c" 1>&6 -echo "configure:2358: checking the operating system" >&5 - -_os=`uname` - -if test `echo $_os | $AWK -F_ '{ print $1 }'` = "CYGWIN"; then - _os="WINNT" -fi - - -## The following allows like systems to share settings this is not meant to -## Imply that these OS are the same thing. -case "$_os" in - "SunOS") - OS_VERSION=solaris - ;; - "Linux") - OS_VERSION=linux - ;; - "WINNT") - OS_VERSION=cygwin - ;; - "Darwin") - OS_VERSION=macosx - ;; - "FreeBSD") - OS_VERSION=linux - ;; - "OSF1") - OS_VERSION=sysvr4 - ;; - "NetBSD") - OS_VERSION=linux - ;; - "IRIX") - OS_VERSION=sysvr4 - ;; - "IRIX64") - OS_VERSION=sysvr4 - ;; - "GNU") - OS_VERSION=linux - ;; - *) - { echo "configure: error: $_os operating system is not suitable to build dmake!" 1>&2; exit 1; } - ;; -esac - -echo "$ac_t""checked ($_os)" 1>&6 - - - - - - - - trap '' 1 2 15 cat > confcache <<\EOF # This file is a shell script that caches the results of configure @@ -2812,25 +2754,6 @@ for am_file in config.h; do esac am_indx=\`expr \$am_indx + 1\` done -am_indx=1 -for am_file in config.h; do - case " \$CONFIG_HEADERS " in - *" \$am_file "*) - am_dir=\`echo \$am_file |sed 's%:.*%%;s%[^/]*\$%%'\` - if test -n "\$am_dir"; then - am_tmpdir=\`echo \$am_dir |sed 's%^\(/*\).*\$%\1%'\` - for am_subdir in \`echo \$am_dir |sed 's%/% %'\`; do - am_tmpdir=\$am_tmpdir\$am_subdir/ - if test ! -d \$am_tmpdir; then - mkdir \$am_tmpdir - fi - done - fi - echo timestamp > "\$am_dir"stamp-h\$am_indx - ;; - esac - am_indx=\`expr \$am_indx + 1\` -done EOF cat >> $CONFIG_STATUS <<\EOF @@ -2873,7 +2796,6 @@ for mf in $CONFIG_FILES; do done done -test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h exit 0 Index: configure.in =================================================================== RCS file: /cvs/tools/dmake/configure.in,v retrieving revision 1.17.4.1.2.1 diff -u -b -B -p -r1.17.4.1.2.1 configure.in --- configure.in 13 Feb 2003 11:55:39 -0000 1.17.4.1.2.1 +++ configure.in 18 Feb 2003 11:48:25 -0000 @@ -31,7 +31,7 @@ dnl Initialize libtool dnl Checks for header files. AC_HEADER_DIRENT AC_HEADER_STDC -AC_CHECK_HEADERS(fcntl.h limits.h strings.h sys/types.h sys/stat.h unistd.h errno.h utime.h spawn.h) +AC_CHECK_HEADERS(fcntl.h limits.h strings.h sys/types.h sys/stat.h unistd.h errno.h utime.h spawn.h wait.h sys/wait.h) dnl Checks for typedefs, structures, and compiler characteristics. AC_C_CONST @@ -98,62 +98,6 @@ case "$_os" in esac AC_MSG_RESULT([checked ($_os)]) - - -AC_SUBST(OS_VERSION) - -AM_CONFIG_HEADER(config.h) - -dnl Checks for OS -AC_MSG_CHECKING([the operating system]) - -_os=`uname` - -if test `echo $_os | $AWK -F_ '{ print $1 }'` = "CYGWIN"; then - _os="WINNT" -fi - - -## The following allows like systems to share settings this is not meant to -## Imply that these OS are the same thing. -case "$_os" in - "SunOS") - OS_VERSION=solaris - ;; - "Linux") - OS_VERSION=linux - ;; - "WINNT") - OS_VERSION=cygwin - ;; - "Darwin") - OS_VERSION=macosx - ;; - "FreeBSD") - OS_VERSION=linux - ;; - "OSF1") - OS_VERSION=sysvr4 - ;; - "NetBSD") - OS_VERSION=linux - ;; - "IRIX") - OS_VERSION=sysvr4 - ;; - "IRIX64") - OS_VERSION=sysvr4 - ;; - "GNU") - OS_VERSION=linux - ;; - *) - AC_MSG_ERROR([$_os operating system is not suitable to build dmake!]) - ;; -esac - -AC_MSG_RESULT([checked ($_os)]) - AC_SUBST(OS_VERSION) Index: unix/runargv.c =================================================================== RCS file: /cvs/tools/dmake/unix/runargv.c,v retrieving revision 1.5.4.1.2.4 diff -u -b -B -p -r1.5.4.1.2.4 runargv.c --- unix/runargv.c 13 Feb 2003 14:12:47 -0000 1.5.4.1.2.4 +++ unix/runargv.c 18 Feb 2003 11:48:30 -0000 @@ -1,64 +1,4 @@ -/************************************************************************* - * - * $RCSfile: runargv.c,v $ - * - * $Revision: 1.5.4.1.2.4 $ - * - * last change: $Author: vq $ $Date: 2003/02/13 14:12:47 $ - * - * The Contents of this file are made available subject to the terms of - * either of the following licenses - * - * - GNU Lesser General Public License Version 2.1 - * - Sun Industry Standards Source License Version 1.1 - * - * Sun Microsystems Inc., October, 2000 - * - * GNU Lesser General Public License Version 2.1 - * ============================================= - * Copyright 2000 by Sun Microsystems, Inc. - * 901 San Antonio Road, Palo Alto, CA 94303, USA - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1, as published by the Free Software Foundation. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, - * MA 02111-1307 USA - * - * - * Sun Industry Standards Source License Version 1.1 - * ================================================= - * The contents of this file are subject to the Sun Industry Standards - * Source License Version 1.1 (the "License"); You may not use this file - * except in compliance with the License. You may obtain a copy of the - * License at http://www.openoffice.org/license.html. - * - * Software provided under this License is provided on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, - * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS, - * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING. - * See the License for the specific provisions governing your rights and - * obligations concerning the Software. - * - * The Initial Developer of the Original Code is: Sun Microsystems, Inc. - * - * Copyright: 2000 by Sun Microsystems, Inc. - * - * All Rights Reserved. - * - * Contributor(s): _______________________________________ - * - * - ************************************************************************/ -/* +/* RCS $Id: runargv.c,v 1.6 2003/01/04 13:02:44 waratah Exp $ -- -- SYNOPSIS -- Invoke a sub process. @@ -84,11 +24,11 @@ */ #include -#if !defined(__APPLE__) && !defined(_MSC_VER) -# if defined(__FreeBSD__) || defined(__CYGWIN__) -# include -# else +#ifdef HAVE_WAIT_H # include +#else +# ifdef HAVE_SYS_WAIT_H +# include # endif #endif @@ -170,23 +110,6 @@ int last; int shell; char *cmd; { - -#if !defined(__CYGWIN__) - extern int errno; -#ifndef __APPLE__ -#ifdef arm32 - extern const char * const sys_errlist[]; -#else -#if defined(linux) || defined(__FreeBSD__) - extern const char * const sys_errlist[]; -#else - extern char *sys_errlist[]; -#endif -#endif -#endif -#else /* __CYGWIN__ */ -#define sys_errlist _sys_errlist -#endif int pid; char **argv;