Attachment #4782 for issue #11593

View | Details | Raw Unified | Return to issue 11593
Collapse All | Expand All

Lines 99-106 Link Here

(-)config.h.in (+6 lines)
99	/* Define if you have the <sys/types.h> header file. */	99	/* Define if you have the <sys/types.h> header file. */
100	#undef HAVE_SYS_TYPES_H	100	#undef HAVE_SYS_TYPES_H
101		101
		102	/* Define if you have the <sys/wait.h> header file. */
		103	#undef HAVE_SYS_WAIT_H
		104
102	/* Define if you have the <unistd.h> header file. */	105	/* Define if you have the <unistd.h> header file. */
103	#undef HAVE_UNISTD_H	106	#undef HAVE_UNISTD_H
104		107
105	/* Define if you have the <utime.h> header file. */	108	/* Define if you have the <utime.h> header file. */
106	#undef HAVE_UTIME_H	109	#undef HAVE_UTIME_H
		110
		111	/* Define if you have the <wait.h> header file. */
		112	#undef HAVE_WAIT_H





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 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


  


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

  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

  done
done

test -z "$CONFIG_HEADERS" || echo timestamp >	   stamp-h
test -z "$CONFIG_HEADERS" || echo timestamp >	   stamp-h

exit 0




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 wait.h sys/wait.h)

dnl Checks for typedefs, structures, and compiler characteristics.
AC_C_CONST

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)





/*  RCS  $Id: runargv.c,v 1.6 2003/01/04 13:02:44 waratah Exp $
 *
 *  $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): _______________________________________
 *
 *
 ************************************************************************/
/*
--
-- SYNOPSIS
--      Invoke a sub process.

*/

#include <signal.h>
#ifdef HAVE_WAIT_H
# if defined(__FreeBSD__) || defined(__CYGWIN__)
#  include <sys/wait.h>
# else 
#  include <wait.h>
#else 
# ifdef HAVE_SYS_WAIT_H
#  include <sys/wait.h>
# endif
#endif


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;


Return to issue 11593

Lines 1675-1681 EOF Link Here

(-)configure (-79 / +1 lines)
1675		1675
1676	fi	1676	fi
1677		1677
1678	for ac_hdr in fcntl.h limits.h strings.h sys/types.h sys/stat.h unistd.h errno.h utime.h spawn.h	1678	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
1679	do	1679	do
1680	ac_safe=`echo "$ac_hdr" \| sed 'y%./+-%__p_%'`	1680	ac_safe=`echo "$ac_hdr" \| sed 'y%./+-%__p_%'`
1681	echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6	1681	echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
Lines 2352-2415 echo "$ac_t""checked ($_os)" 1>&6 Link Here
2352		2352
2353		2353
2354		2354
2355
2356	echo $ac_n "checking the operating system""... $ac_c" 1>&6
2357	echo "configure:2358: checking the operating system" >&5
2358
2359	_os=`uname`
2360
2361	if test `echo $_os \| $AWK -F_ '{ print $1 }'` = "CYGWIN"; then
2362	_os="WINNT"
2363	fi
2364
2365
2366	## The following allows like systems to share settings this is not meant to
2367	## Imply that these OS are the same thing.
2368	case "$_os" in
2369	"SunOS")
2370	OS_VERSION=solaris
2371	;;
2372	"Linux")
2373	OS_VERSION=linux
2374	;;
2375	"WINNT")
2376	OS_VERSION=cygwin
2377	;;
2378	"Darwin")
2379	OS_VERSION=macosx
2380	;;
2381	"FreeBSD")
2382	OS_VERSION=linux
2383	;;
2384	"OSF1")
2385	OS_VERSION=sysvr4
2386	;;
2387	"NetBSD")
2388	OS_VERSION=linux
2389	;;
2390	"IRIX")
2391	OS_VERSION=sysvr4
2392	;;
2393	"IRIX64")
2394	OS_VERSION=sysvr4
2395	;;
2396	"GNU")
2397	OS_VERSION=linux
2398	;;
2399	*)
2400	{ echo "configure: error: $_os operating system is not suitable to build dmake!" 1>&2; exit 1; }
2401	;;
2402	esac
2403
2404	echo "$ac_t""checked ($_os)" 1>&6
2405
2406
2407
2408
2409
2410
2411
2412
2413	trap '' 1 2 15	2355	trap '' 1 2 15
2414	cat > confcache <<\EOF	2356	cat > confcache <<\EOF
2415	# This file is a shell script that caches the results of configure	2357	# This file is a shell script that caches the results of configure
Lines 2812-2836 for am_file in config.h; do Link Here
2812	esac	2754	esac
2813	am_indx=\`expr \$am_indx + 1\`	2755	am_indx=\`expr \$am_indx + 1\`
2814	done	2756	done
2815	am_indx=1
2816	for am_file in config.h; do
2817	case " \$CONFIG_HEADERS " in
2818	" \$am_file ")
2819	am_dir=\`echo \$am_file \|sed 's%:.%%;s%[^/]\$%%'\`
2820	if test -n "\$am_dir"; then
2821	am_tmpdir=\`echo \$am_dir \|sed 's%^\(/\).\$%\1%'\`
2822	for am_subdir in \`echo \$am_dir \|sed 's%/% %'\`; do
2823	am_tmpdir=\$am_tmpdir\$am_subdir/
2824	if test ! -d \$am_tmpdir; then
2825	mkdir \$am_tmpdir
2826	fi
2827	done
2828	fi
2829	echo timestamp > "\$am_dir"stamp-h\$am_indx
2830	;;
2831	esac
2832	am_indx=\`expr \$am_indx + 1\`
2833	done
2834		2757
2835	EOF	2758	EOF
2836	cat >> $CONFIG_STATUS <<\EOF	2759	cat >> $CONFIG_STATUS <<\EOF
Lines 2873-2879 for mf in $CONFIG_FILES; do Link Here
2873	done	2796	done
2874	done	2797	done
2875		2798
2876	test -z "$CONFIG_HEADERS" \|\| echo timestamp > stamp-h
2877	test -z "$CONFIG_HEADERS" \|\| echo timestamp > stamp-h	2799	test -z "$CONFIG_HEADERS" \|\| echo timestamp > stamp-h
2878		2800
2879	exit 0	2801	exit 0

Lines 31-37 dnl Initialize libtool Link Here

(-)configure.in (-57 / +1 lines)
31	dnl Checks for header files.	31	dnl Checks for header files.
32	AC_HEADER_DIRENT	32	AC_HEADER_DIRENT
33	AC_HEADER_STDC	33	AC_HEADER_STDC
34	AC_CHECK_HEADERS(fcntl.h limits.h strings.h sys/types.h sys/stat.h unistd.h errno.h utime.h spawn.h)	34	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)
35		35
36	dnl Checks for typedefs, structures, and compiler characteristics.	36	dnl Checks for typedefs, structures, and compiler characteristics.
37	AC_C_CONST	37	AC_C_CONST
Lines 98-159 case "$_os" in Link Here
98	esac	98	esac
99		99
100	AC_MSG_RESULT([checked ($_os)])	100	AC_MSG_RESULT([checked ($_os)])
101
102
103	AC_SUBST(OS_VERSION)
104
105	AM_CONFIG_HEADER(config.h)
106
107	dnl Checks for OS
108	AC_MSG_CHECKING([the operating system])
109
110	_os=`uname`
111
112	if test `echo $_os \| $AWK -F_ '{ print $1 }'` = "CYGWIN"; then
113	_os="WINNT"
114	fi
115
116
117	## The following allows like systems to share settings this is not meant to
118	## Imply that these OS are the same thing.
119	case "$_os" in
120	"SunOS")
121	OS_VERSION=solaris
122	;;
123	"Linux")
124	OS_VERSION=linux
125	;;
126	"WINNT")
127	OS_VERSION=cygwin
128	;;
129	"Darwin")
130	OS_VERSION=macosx
131	;;
132	"FreeBSD")
133	OS_VERSION=linux
134	;;
135	"OSF1")
136	OS_VERSION=sysvr4
137	;;
138	"NetBSD")
139	OS_VERSION=linux
140	;;
141	"IRIX")
142	OS_VERSION=sysvr4
143	;;
144	"IRIX64")
145	OS_VERSION=sysvr4
146	;;
147	"GNU")
148	OS_VERSION=linux
149	;;
150	*)
151	AC_MSG_ERROR([$_os operating system is not suitable to build dmake!])
152	;;
153	esac
154
155	AC_MSG_RESULT([checked ($_os)])
156
157		101
158	AC_SUBST(OS_VERSION)	102	AC_SUBST(OS_VERSION)
159		103

Lines 1-64 Link Here

(-)unix/runargv.c (-82 / +5 lines)
1	/*************************************************************************	1	/* RCS $Id: runargv.c,v 1.6 2003/01/04 13:02:44 waratah Exp $
2	*
3	* $RCSfile: runargv.c,v $
4	*
5	* $Revision: 1.5.4.1.2.4 $
6	*
7	* last change: $Author: vq $ $Date: 2003/02/13 14:12:47 $
8	*
9	* The Contents of this file are made available subject to the terms of
10	* either of the following licenses
11	*
12	* - GNU Lesser General Public License Version 2.1
13	* - Sun Industry Standards Source License Version 1.1
14	*
15	* Sun Microsystems Inc., October, 2000
16	*
17	* GNU Lesser General Public License Version 2.1
18	* =============================================
19	* Copyright 2000 by Sun Microsystems, Inc.
20	* 901 San Antonio Road, Palo Alto, CA 94303, USA
21	*
22	* This library is free software; you can redistribute it and/or
23	* modify it under the terms of the GNU Lesser General Public
24	* License version 2.1, as published by the Free Software Foundation.
25	*
26	* This library is distributed in the hope that it will be useful,
27	* but WITHOUT ANY WARRANTY; without even the implied warranty of
28	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
29	* Lesser General Public License for more details.
30	*
31	* You should have received a copy of the GNU Lesser General Public
32	* License along with this library; if not, write to the Free Software
33	* Foundation, Inc., 59 Temple Place, Suite 330, Boston,
34	* MA 02111-1307 USA
35	*
36	*
37	* Sun Industry Standards Source License Version 1.1
38	* =================================================
39	* The contents of this file are subject to the Sun Industry Standards
40	* Source License Version 1.1 (the "License"); You may not use this file
41	* except in compliance with the License. You may obtain a copy of the
42	* License at http://www.openoffice.org/license.html.
43	*
44	* Software provided under this License is provided on an "AS IS" basis,
45	* WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
46	* WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
47	* MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
48	* See the License for the specific provisions governing your rights and
49	* obligations concerning the Software.
50	*
51	* The Initial Developer of the Original Code is: Sun Microsystems, Inc.
52	*
53	* Copyright: 2000 by Sun Microsystems, Inc.
54	*
55	* All Rights Reserved.
56	*
57	* Contributor(s): _______________________________________
58	*
59	*
60	************************************************************************/
61	/*
62	--	2	--
63	-- SYNOPSIS	3	-- SYNOPSIS
64	-- Invoke a sub process.	4	-- Invoke a sub process.
Lines 84-94 Link Here
84	*/	24	*/
85		25
86	#include <signal.h>	26	#include <signal.h>
87	#if !defined(__APPLE__) && !defined(_MSC_VER)	27	#ifdef HAVE_WAIT_H
88	# if defined(__FreeBSD__) \|\| defined(__CYGWIN__)
89	# include <sys/wait.h>
90	# else
91	# include <wait.h>	28	# include <wait.h>
		29	#else
		30	# ifdef HAVE_SYS_WAIT_H
		31	# include <sys/wait.h>
92	# endif	32	# endif
93	#endif	33	#endif
94		34
Lines 170-192 int last; Link Here
170	int shell;	110	int shell;
171	char *cmd;	111	char *cmd;
172	{	112	{
173
174	#if !defined(__CYGWIN__)
175	extern int errno;
176	#ifndef __APPLE__
177	#ifdef arm32
178	extern const char * const sys_errlist[];
179	#else
180	#if defined(linux) \|\| defined(__FreeBSD__)
181	extern const char * const sys_errlist[];
182	#else
183	extern char *sys_errlist[];
184	#endif
185	#endif
186	#endif
187	#else /* __CYGWIN__ */
188	#define sys_errlist _sys_errlist
189	#endif
190	int pid;	113	int pid;
191	char **argv;	114	char **argv;
192		115