Fri Nov 13 00:15:08 1998 Geoffrey Noer <noer@cygnus.com>

Changes to account for name change from cygwin32 to cygwin and
        clean up Win32-related ifdefs.

        * configure.tgt: check for cygwin* instead of cygwin32.
        New cygwin gdb_target variable loses the "32".
        * configure.host: check for cygwin* instead of cygwin32.
        New cygwin gdb_host variable loses the "32".
        * configure.in: test __CYGWIN__ instead of __CYGWIN32__,
        rename gdb_cv_os_cygwin32 variable to drop the "32".  Call
        AM_EXEEXT instead of AC_EXEEXT since that isn't in a released
        autoconf yet.
        * configure: regenerate.

        * main.c: drop "32" from cygwin_ funcs, include sys/cygwin.h
          where
        cygwin path conv protos live, instead of adding a proto here
          for
        them here.
        * {main.c, ser-tcp.c, ser-unix.c, top.c}: check __CYGWIN__
        instead of __CYGWIN32__.
        * source.c: thoughout, check _WIN32 instead of WIN32.

        * config/i386/cygwin32.mh: delete.
        * config/i386/cygwin.mh: new file, was cygwin32.mh.
        * config/i386/cygwin32.mt: delete.
        * config/i386/cygwin.mt: new file, was cygwin32.mt.
        * config/i386/tm-cygwin32.h: delete.
        * config/i386/tm-cygwin.h: new file, was tm-cygwin32.h.
        * config/i386/xm-cygwin32.h: delete.
        * config/i386/xm-cygwin.h: new file, was xm-cygwin32.h.
        * config/i386/xm-windows.h: #include xm-cygwin.h now.
        * config/powerpc/cygwin32.mh: delete.
        * config/powerpc/cygwin.mh: new file, was cygwin32.mh.
        * config/powerpc/cygwin32.mt: delete.
        * config/powerpc/cygwin.mt: new file, was cygwin32.mt.
        * config/powerpc/tm-cygwin32.h: delete.
        * config/powerpc/tm-cygwin.h: new file, was tm-cygwin32.h.
        * config/powerpc/xm-cygwin32.h: delete.
        * config/powerpc/xm-cygwin.h: new file, was xm-cygwin32.h.

        * rdi-share/aclocal.m4: regenerate with aclocal.
        * rdi-share/configure: regenerate with autoconf.
        * rdi-share/{host.h, hostchan.c, hostchan.h, serdrv.c,
        * serpardr.c,
        unixcomm.c}: check __CYGWIN__ instead of __CYGWIN32__.
This commit is contained in:
Geoffrey Noer 1998-11-13 08:16:08 +00:00
parent 7c1c728ee2
commit d836385e11
31 changed files with 616 additions and 977 deletions

View File

@ -1,3 +1,48 @@
Fri Nov 13 00:15:08 1998 Geoffrey Noer <noer@cygnus.com>
Changes to account for name change from cygwin32 to cygwin and
clean up Win32-related ifdefs.
* configure.tgt: check for cygwin* instead of cygwin32.
New cygwin gdb_target variable loses the "32".
* configure.host: check for cygwin* instead of cygwin32.
New cygwin gdb_host variable loses the "32".
* configure.in: test __CYGWIN__ instead of __CYGWIN32__,
rename gdb_cv_os_cygwin32 variable to drop the "32". Call
AM_EXEEXT instead of AC_EXEEXT since that isn't in a released
autoconf yet.
* configure: regenerate.
* main.c: drop "32" from cygwin_ funcs, include sys/cygwin.h where
cygwin path conv protos live, instead of adding a proto here for
them here.
* {main.c, ser-tcp.c, ser-unix.c, top.c}: check __CYGWIN__
instead of __CYGWIN32__.
* source.c: thoughout, check _WIN32 instead of WIN32.
* config/i386/cygwin32.mh: delete.
* config/i386/cygwin.mh: new file, was cygwin32.mh.
* config/i386/cygwin32.mt: delete.
* config/i386/cygwin.mt: new file, was cygwin32.mt.
* config/i386/tm-cygwin32.h: delete.
* config/i386/tm-cygwin.h: new file, was tm-cygwin32.h.
* config/i386/xm-cygwin32.h: delete.
* config/i386/xm-cygwin.h: new file, was xm-cygwin32.h.
* config/i386/xm-windows.h: #include xm-cygwin.h now.
* config/powerpc/cygwin32.mh: delete.
* config/powerpc/cygwin.mh: new file, was cygwin32.mh.
* config/powerpc/cygwin32.mt: delete.
* config/powerpc/cygwin.mt: new file, was cygwin32.mt.
* config/powerpc/tm-cygwin32.h: delete.
* config/powerpc/tm-cygwin.h: new file, was tm-cygwin32.h.
* config/powerpc/xm-cygwin32.h: delete.
* config/powerpc/xm-cygwin.h: new file, was xm-cygwin32.h.
* rdi-share/aclocal.m4: regenerate with aclocal.
* rdi-share/configure: regenerate with autoconf.
* rdi-share/{host.h, hostchan.c, hostchan.h, serdrv.c, serpardr.c,
unixcomm.c}: check __CYGWIN__ instead of __CYGWIN32__.
Thu Nov 12 17:19:43 1998 John Metzler <jmetzler@cygnus.com>
* remote.c (remote_get_threadinfo) : Support for remote

View File

@ -1,3 +1,15 @@
Fri Nov 13 00:15:08 1998 Geoffrey Noer <noer@cygnus.com>
Changes to account for name change from cygwin32 to cygwin and
clean up Win32-related ifdefs.
* gdbtk.c: lose "32" from cygwin_ func calls. ifndef for
checking DISPLAY should be for _WIN32, not WINNT.
* gdbtk.h: pick GDBTK_PATH_SEP based on _WIN32, not WINNT.
* gdbtk-cmds.c (gdb_path_conv): lose "32" from cygwin_ func call,
change ifdef to __CYGWIN__ instead of WINNT.
* {gdbtk.c, gdbtk-hooks.c}: __CYGWIN32__ refs drop the "32".
Thu Nov 12 15:20:15 1998 Jim Ingham <jingham@cygnus.com>
* gdbtk-cmds.c (gdb_cmd): Added an optional second argument to the

View File

@ -1,6 +1,6 @@
# Target: Intel 386 run win32
TDEPFILES= i386-tdep.o i387-tdep.o
TM_FILE= tm-cygwin32.h
TM_FILE= tm-cygwin.h

View File

@ -1,8 +0,0 @@
MH_CFLAGS=
XM_FILE=xm-cygwin32.h
XDEPFILES=ser-tcp.o
TERMCAP=
NATDEPFILES= win32-nat.o
NAT_FILE=../nm-empty.h
XM_CLIBS=

View File

@ -1,5 +1,5 @@
/* Definitions for hosting on WIN32, built with Microsoft Visual C/C++, for GDB.
Copyright 1996 Free Software Foundation, Inc.
Copyright 1996, 1998 Free Software Foundation, Inc.
This file is part of GDB.
@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
#include "i386/xm-cygwin32.h"
#include "i386/xm-cygwin.h"
#undef PRINTF_HAS_LONG_LONG
#undef HAVE_UNISTD_H

View File

@ -1,5 +1,5 @@
MH_CFLAGS=
XM_FILE=xm-cygwin32.h
XM_FILE=xm-cygwin.h
XDEP_FILES=ser-tcp.o
TERMCAP=
NATDEPFILES=win32-nat.o

View File

@ -1,6 +1,6 @@
# Target: Powerpc running cygnus's unix api over win32
TDEPFILES= rs6000-tdep.o
TM_FILE= tm-cygwin32.h
TM_FILE= tm-cygwin.h

1091
gdb/configure vendored

File diff suppressed because it is too large Load Diff

View File

@ -73,7 +73,7 @@ i[3456]86-*-unixware2*) gdb_host=i386v42mp ;;
i[3456]86-*-unixware*) gdb_host=i386v4 ;;
i[3456]86-*-sysv*) gdb_host=i386v ;;
i[3456]86-*-isc*) gdb_host=i386v32 ;;
i[3456]86-*-cygwin32) gdb_host=cygwin32 ;;
i[3456]86-*-cygwin*) gdb_host=cygwin ;;
m680[01]0-sun-sunos3*) gdb_host=sun2os3 ;;
m680[01]0-sun-sunos4*) gdb_host=sun2os4 ;;
m68030-sony-*) gdb_host=news1000 ;;
@ -124,7 +124,7 @@ ns32k-umax-*) gdb_host=umax ;;
ns32k-utek-sysv*) gdb_host=merlin ;;
powerpc-*-aix*) gdb_host=aix ;;
powerpcle-*-cygwin32) gdb_host=cygwin32 ;;
powerpcle-*-cygwin*) gdb_host=cygwin ;;
powerpcle-*-solaris*) gdb_host=solaris ;;
powerpc-*-linux*) gdb_host=linux ;;

View File

@ -548,11 +548,11 @@ case "$host" in
])
# In the Cygwin environment, we need some additional flags.
AC_CACHE_CHECK([for cygwin32], gdb_cv_os_cygwin32,
AC_CACHE_CHECK([for cygwin], gdb_cv_os_cygwin,
[AC_EGREP_CPP(lose, [
#ifdef __CYGWIN32__
#ifdef __CYGWIN__
lose
#endif],[gdb_cv_os_cygwin32=yes],[gdb_cv_os_cygwin32=no])])
#endif],[gdb_cv_os_cygwin=yes],[gdb_cv_os_cygwin=no])])
WIN32LIBS=
WIN32LDAPP=
@ -564,7 +564,7 @@ WINDRES=${WINDRES-windres}
AC_SUBST(DLLTOOL)
AC_SUBST(WINDRES)
if test x$gdb_cv_os_cygwin32 = xyes; then
if test x$gdb_cv_os_cygwin = xyes; then
if test x$enable_ide = xyes; then
WIN32LIBS="-ladvapi32"
fi
@ -641,7 +641,7 @@ if test "${enable_gdbtk}" = "yes"; then
GDBTKLIBS="${TCL_LIBS} ${TK_LIBS}"
CONFIG_OBS="${CONFIG_OBS} gdbtk.o gdbtk-cmds.o gdbtk-hooks.o"
if test x$gdb_cv_os_cygwin32 = xyes; then
if test x$gdb_cv_os_cygwin = xyes; then
WIN32LIBS="${WIN32LIBS} -lshell32 -lgdi32 -lcomdlg32 -ladvapi32 -luser32"
WIN32LDAPP="-Wl,--subsystem,console"
CONFIG_OBS="${CONFIG_OBS} gdbres.o"
@ -847,7 +847,7 @@ fi
AC_LINK_FILES($files, $links)
dnl Check for exe extension set on certain hosts (e.g. Win32)
AC_EXEEXT
AM_EXEEXT
AC_CONFIG_SUBDIRS($configdirs)
AC_OUTPUT(Makefile .gdbinit:gdbinit.in,

View File

@ -112,7 +112,7 @@ i[3456]86-*-gnu*) gdb_target=i386gnu ;;
i[3456]86-*-netware*) gdb_target=i386nw
configdirs="${configdirs} nlm" ;;
i[3456]86-*-osf1mk*) gdb_target=i386mk ;;
i[3456]86-*-cygwin32) gdb_target=cygwin32 ;;
i[3456]86-*-cygwin*) gdb_target=cygwin ;;
i960-*-bout*) gdb_target=vxworks960 ;;
i960-nindy-coff*) gdb_target=nindy960 ;;
i960-*-coff*) gdb_target=mon960 ;;
@ -237,7 +237,7 @@ powerpc-*-netware*) gdb_target=ppc-nw
configdirs="${configdirs} nlm" ;;
powerpc-*-aix*) gdb_target=aix ;;
powerpcle-*-cygwin32) gdb_target=cygwin32 ;;
powerpcle-*-cygwin*) gdb_target=cygwin ;;
powerpcle-*-solaris*) gdb_target=solaris ;;
powerpc-*-eabi* | powerpc-*-linux* | powerpc-*-sysv* | powerpc-*-elf*)
if test -f ../sim/ppc/Makefile; then
@ -295,7 +295,7 @@ v850-*-*) gdb_target=v850
windows)
CONFIG_OBS="${CONFIG_OBS} v850ice.o"
LIBS="${LIBS} necmsg.lib" ;;
cygwin32)
cygwin*)
CONFIG_OBS="${CONFIG_OBS} v850ice.o" ;;
esac
;;
@ -306,7 +306,7 @@ v850e-*-*) gdb_target=v850
windows)
CONFIG_OBS="${CONFIG_OBS} v850ice.o"
LIBS="${LIBS} v850.lib" ;;
cygwin32)
cygwin*)
CONFIG_OBS="${CONFIG_OBS} v850ice.o" ;;
esac
;;
@ -316,7 +316,7 @@ v850ea-*-*) gdb_target=v850
windows)
CONFIG_OBS="${CONFIG_OBS} v850ice.o"
LIBS="${LIBS} v850.lib" ;;
cygwin32)
cygwin*)
CONFIG_OBS="${CONFIG_OBS} v850ice.o" ;;
esac
;;

View File

@ -3434,11 +3434,11 @@ gdb_path_conv (clientData, interp, objc, objv)
if (objc != 2)
error ("wrong # args");
#ifdef WINNT
#ifdef __CYGWIN__
{
char pathname[256], *ptr;
cygwin32_conv_to_full_win32_path (Tcl_GetStringFromObj(objv[1], NULL), pathname);
cygwin_conv_to_full_win32_path (Tcl_GetStringFromObj (objv[1], NULL), pathname);
for (ptr = pathname; *ptr; ptr++)
{
if (*ptr == '\\')

View File

@ -77,7 +77,7 @@ extern int (*ui_load_progress_hook) PARAMS ((char *, unsigned long));
extern void (*pre_add_symbol_hook) PARAMS ((char *));
extern void (*post_add_symbol_hook) PARAMS ((void));
extern void (*selected_frame_level_changed_hook) PARAMS ((int));
#ifdef __CYGWIN32__
#ifdef __CYGWIN__
extern void (*ui_loop_hook) PARAMS ((int));
#endif
@ -151,7 +151,7 @@ gdbtk_add_hooks(void)
target_wait_hook = gdbtk_wait;
ui_load_progress_hook = gdbtk_load_hash;
#ifdef __CYGWIN32__
#ifdef __CYGWIN__
ui_loop_hook = x_event;
#endif
pre_add_symbol_hook = gdbtk_pre_add_symbol;
@ -369,7 +369,7 @@ x_event (signo)
in_x_event = 1;
#ifdef __CYGWIN32__
#ifdef __CYGWIN__
if (signo == -2)
gdbtk_stop_timer ();
#endif

View File

@ -71,7 +71,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
#include "annotate.h"
#include <sys/time.h>
/* For Cygwin32, we use a timer to periodically check for Windows
/* For Cygwin, we use a timer to periodically check for Windows
messages. FIXME: It would be better to not poll, but to instead
rewrite the target_wait routines to serve as input sources.
Unfortunately, that will be a lot of work. */
@ -329,7 +329,7 @@ gdbtk_init ( argv0 )
causing gdb to abort. If instead we simply return here, gdb will
gracefully degrade to using the command line interface. */
#ifndef WINNT
#ifndef _WIN32
if (getenv ("DISPLAY") == NULL)
return;
#endif
@ -444,7 +444,7 @@ gdbtk_init ( argv0 )
* These are the commands to do some Windows Specific stuff...
*/
#ifdef __CYGWIN32__
#ifdef __CYGWIN__
if (ide_create_messagebox_command (gdbtk_interp) != TCL_OK)
error ("messagebox command initialization failed");
/* On Windows, create a sizebox widget command */
@ -679,15 +679,15 @@ _initialize_gdbtk ()
/* Tell the rest of the world that Gdbtk is now set up. */
init_ui_hook = gdbtk_init;
#ifdef __CYGWIN32__
#ifdef __CYGWIN__
(void) FreeConsole ();
#endif
}
#ifdef __CYGWIN32__
#ifdef __CYGWIN__
else
{
DWORD ft = GetFileType (GetStdHandle (STD_INPUT_HANDLE));
void cygwin32_attach_handle_to_fd (char *, int, HANDLE, int, int);
void cygwin_attach_handle_to_fd (char *, int, HANDLE, int, int);
switch (ft)
{
@ -697,15 +697,15 @@ _initialize_gdbtk ()
break;
default:
AllocConsole();
cygwin32_attach_handle_to_fd ("/dev/conin", 0,
GetStdHandle (STD_INPUT_HANDLE),
1, GENERIC_READ);
cygwin32_attach_handle_to_fd ("/dev/conout", 1,
GetStdHandle (STD_OUTPUT_HANDLE),
0, GENERIC_WRITE);
cygwin32_attach_handle_to_fd ("/dev/conout", 2,
GetStdHandle (STD_ERROR_HANDLE),
0, GENERIC_WRITE);
cygwin_attach_handle_to_fd ("/dev/conin", 0,
GetStdHandle (STD_INPUT_HANDLE),
1, GENERIC_READ);
cygwin_attach_handle_to_fd ("/dev/conout", 1,
GetStdHandle (STD_OUTPUT_HANDLE),
0, GENERIC_WRITE);
cygwin_attach_handle_to_fd ("/dev/conout", 2,
GetStdHandle (STD_ERROR_HANDLE),
0, GENERIC_WRITE);
break;
}
}

View File

@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
#ifdef WINNT
#ifdef _WIN32
#define GDBTK_PATH_SEP ";"
#else
#define GDBTK_PATH_SEP ":"

View File

@ -56,14 +56,11 @@ int display_space;
static void print_gdb_help PARAMS ((GDB_FILE *));
extern void gdb_init PARAMS ((char *));
#ifdef __CYGWIN32__
#ifdef __CYGWIN__
#include <windows.h> /* for MAX_PATH */
extern void cygwin32_conv_to_posix_path (const char *, char *);
#include <sys/cygwin.h> /* for cygwin_conv_to_posix_path */
#endif
extern void (*pre_add_symbol_hook) PARAMS ((char *));
extern void (*post_add_symbol_hook) PARAMS ((void));
int
main (argc, argv)
int argc;
@ -180,7 +177,9 @@ main (argc, argv)
{"version", no_argument, &print_version, 1},
{"x", required_argument, 0, 'x'},
/* start-sanitize-gdbtk */
#ifdef GDBTK
{"tclcommand", required_argument, 0, 'z'},
#endif
/* end-sanitize-gdbtk */
{"directory", required_argument, 0, 'd'},
{"cd", required_argument, 0, 11},
@ -257,6 +256,7 @@ main (argc, argv)
}
break;
/* start-sanitize-gdbtk */
#ifdef GDBTK
case 'z':
{
extern int gdbtk_test PARAMS ((char *));
@ -268,6 +268,7 @@ main (argc, argv)
}
break;
}
#endif /* GDBTK */
/* end-sanitize-gdbtk */
case 'd':
dirarg[ndir++] = optarg;
@ -397,17 +398,17 @@ main (argc, argv)
*before* all the command line arguments are processed; it sets
global parameters, which are independent of what file you are
debugging or what directory you are in. */
#ifdef __CYGWIN32__
#ifdef __CYGWIN__
{
char * tmp = getenv ("HOME");
if (tmp != NULL)
{
homedir = (char *) alloca (MAX_PATH+1);
cygwin32_conv_to_posix_path (tmp, homedir);
} else {
homedir = NULL;
cygwin_conv_to_posix_path (tmp, homedir);
}
else
homedir = NULL;
}
#else
homedir = getenv ("HOME");
@ -464,12 +465,8 @@ main (argc, argv)
it, better only print one error message. */
if (!SET_TOP_LEVEL ())
{
if (pre_add_symbol_hook)
pre_add_symbol_hook (symarg);
exec_file_command (execarg, !batch);
symbol_file_command (symarg, 0);
if (post_add_symbol_hook)
post_add_symbol_hook ();
}
}
else

View File

@ -1,7 +1,7 @@
dnl aclocal.m4 generated automatically by aclocal 1.2e
dnl aclocal.m4 generated automatically by aclocal 1.3b
dnl Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
dnl This Makefile.in is free software; the Free Software Foundation
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
@ -139,15 +139,15 @@ AC_DEFUN(AM_MAINTAINER_MODE,
# Otherwise set it to "".
dnl AM_EXEEXT()
dnl This knows we add .exe if we're building in the Cygwin32
dnl This knows we add .exe if we're building in the Cygwin
dnl environment. But if we're not, then it compiles a test program
dnl to see if there is a suffix for executables.
AC_DEFUN(AM_EXEEXT,
[AC_REQUIRE([AM_CYGWIN32])
[AC_REQUIRE([AM_CYGWIN])
AC_REQUIRE([AM_MINGW32])
AC_MSG_CHECKING([for executable suffix])
AC_CACHE_VAL(am_cv_exeext,
[if test "$CYGWIN32" = yes || test "$MINGW32" = yes; then
[if test "$CYGWIN" = yes || test "$MINGW32" = yes; then
am_cv_exeext=.exe
else
cat > am_c_test.c << 'EOF'
@ -156,7 +156,14 @@ int main() {
}
EOF
${CC-cc} -o am_c_test $CFLAGS $CPPFLAGS $LDFLAGS am_c_test.c $LIBS 1>&5
am_cv_exeext=`echo am_c_test.* | grep -v am_c_test.c | sed -e s/am_c_test//`
am_cv_exeext=
for file in am_c_test.*; do
case $file in
*.c) ;;
*.o) ;;
*) am_cv_exeext=`echo $file | sed -e s/am_c_test//` ;;
esac
done
rm -f am_c_test*])
test x"${am_cv_exeext}" = x && am_cv_exeext=no
fi
@ -165,9 +172,24 @@ test x"${am_cv_exeext}" != xno && EXEEXT=${am_cv_exeext}
AC_MSG_RESULT(${am_cv_exeext})
AC_SUBST(EXEEXT)])
# Check to see if we're running under Cygwin, without using
# AC_CANONICAL_*. If so, set output variable CYGWIN to "yes".
# Otherwise set it to "no".
dnl AM_CYGWIN()
AC_DEFUN(AM_CYGWIN,
[AC_CACHE_CHECK(for Cygwin environment, am_cv_cygwin,
[AC_TRY_COMPILE(,[return __CYGWIN__;],
am_cv_cygwin=yes, am_cv_cygwin=no)
rm -f conftest*])
CYGWIN=
test "$am_cv_cygwin" = yes && CYGWIN=yes])
# Check to see if we're running under Cygwin32, without using
# AC_CANONICAL_*. If so, set output variable CYGWIN32 to "yes".
# Otherwise set it to "no".
# Note: Although Cygwin32 has changed names, for now we keep the
# old macro around...
dnl AM_CYGWIN32()
AC_DEFUN(AM_CYGWIN32,
@ -178,6 +200,7 @@ rm -f conftest*])
CYGWIN32=
test "$am_cv_cygwin32" = yes && CYGWIN32=yes])
# Check to see if we're running under Mingw, without using
# AC_CANONICAL_*. If so, set output variable MINGW32 to "yes".
# Otherwise set it to "no".

View File

@ -1,7 +1,7 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated automatically using autoconf version 2.12.1
# Generated automatically using autoconf version 2.12.2
# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
#
# This configure script is free software; the Free Software Foundation
@ -336,7 +336,7 @@ EOF
verbose=yes ;;
-version | --version | --versio | --versi | --vers)
echo "configure generated by autoconf version 2.12.1"
echo "configure generated by autoconf version 2.12.2"
exit 0 ;;
-with-* | --with-*)
@ -506,9 +506,11 @@ ac_ext=c
# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
ac_cpp='$CPP $CPPFLAGS'
ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
cross_compiling=$ac_cv_prog_cc_cross
ac_exeext=
ac_objext=o
if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
# Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
@ -554,12 +556,12 @@ ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
# ./install, which can be erroneously created by make from ./install.sh.
echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
echo "configure:558: checking for a BSD compatible install" >&5
echo "configure:560: checking for a BSD compatible install" >&5
if test -z "$INSTALL"; then
if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS="${IFS}:"
IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS=":"
for ac_dir in $PATH; do
# Account for people who put trailing slashes in PATH elements.
case "$ac_dir/" in
@ -608,7 +610,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
echo "configure:612: checking whether build environment is sane" >&5
echo "configure:614: checking whether build environment is sane" >&5
# Just in case
sleep 1
echo timestamp > conftestfile
@ -665,7 +667,7 @@ test "$program_suffix" != NONE &&
test "$program_transform_name" = "" && program_transform_name="s,x,x,"
echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
echo "configure:669: checking whether ${MAKE-make} sets \${MAKE}" >&5
echo "configure:671: checking whether ${MAKE-make} sets \${MAKE}" >&5
set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@ -711,7 +713,7 @@ EOF
missing_dir=`cd $ac_aux_dir && pwd`
echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
echo "configure:715: checking for working aclocal" >&5
echo "configure:717: checking for working aclocal" >&5
# Run test in a subshell; some versions of sh will print an error if
# an executable is not found, even if stderr is redirected.
# Redirect stdin to placate older versions of autoconf. Sigh.
@ -724,7 +726,7 @@ else
fi
echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
echo "configure:728: checking for working autoconf" >&5
echo "configure:730: checking for working autoconf" >&5
# Run test in a subshell; some versions of sh will print an error if
# an executable is not found, even if stderr is redirected.
# Redirect stdin to placate older versions of autoconf. Sigh.
@ -737,7 +739,7 @@ else
fi
echo $ac_n "checking for working automake""... $ac_c" 1>&6
echo "configure:741: checking for working automake" >&5
echo "configure:743: checking for working automake" >&5
# Run test in a subshell; some versions of sh will print an error if
# an executable is not found, even if stderr is redirected.
# Redirect stdin to placate older versions of autoconf. Sigh.
@ -750,7 +752,7 @@ else
fi
echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
echo "configure:754: checking for working autoheader" >&5
echo "configure:756: checking for working autoheader" >&5
# Run test in a subshell; some versions of sh will print an error if
# an executable is not found, even if stderr is redirected.
# Redirect stdin to placate older versions of autoconf. Sigh.
@ -763,7 +765,7 @@ else
fi
echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
echo "configure:767: checking for working makeinfo" >&5
echo "configure:769: checking for working makeinfo" >&5
# Run test in a subshell; some versions of sh will print an error if
# an executable is not found, even if stderr is redirected.
# Redirect stdin to placate older versions of autoconf. Sigh.
@ -783,14 +785,14 @@ VERSION=1.0
# Extract the first word of "gcc", so it can be a program name with args.
set dummy gcc; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:787: checking for $ac_word" >&5
echo "configure:789: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
else
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
for ac_dir in $PATH; do
test -z "$ac_dir" && ac_dir=.
if test -f $ac_dir/$ac_word; then
@ -812,14 +814,14 @@ if test -z "$CC"; then
# Extract the first word of "cc", so it can be a program name with args.
set dummy cc; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:816: checking for $ac_word" >&5
echo "configure:818: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
else
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
ac_prog_rejected=no
for ac_dir in $PATH; do
test -z "$ac_dir" && ac_dir=.
@ -856,25 +858,58 @@ else
echo "$ac_t""no" 1>&6
fi
if test -z "$CC"; then
case "`uname -s`" in
*win32* | *WIN32*)
# Extract the first word of "cl", so it can be a program name with args.
set dummy cl; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:868: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
else
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
for ac_dir in $PATH; do
test -z "$ac_dir" && ac_dir=.
if test -f $ac_dir/$ac_word; then
ac_cv_prog_CC="cl"
break
fi
done
IFS="$ac_save_ifs"
fi
fi
CC="$ac_cv_prog_CC"
if test -n "$CC"; then
echo "$ac_t""$CC" 1>&6
else
echo "$ac_t""no" 1>&6
fi
;;
esac
fi
test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
echo "configure:864: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
echo "configure:899: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
ac_ext=c
# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
ac_cpp='$CPP $CPPFLAGS'
ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
cross_compiling=$ac_cv_prog_cc_cross
cat > conftest.$ac_ext <<EOF
#line 874 "configure"
#line 909 "configure"
#include "confdefs.h"
main(){return(0);}
EOF
if { (eval echo configure:878: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
if { (eval echo configure:913: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
ac_cv_prog_cc_works=yes
# If we can't run a trivial program, we are probably using a cross compiler.
if (./conftest; exit) 2>/dev/null; then
@ -894,12 +929,12 @@ if test $ac_cv_prog_cc_works = no; then
{ echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
echo "configure:898: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
echo "configure:933: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
cross_compiling=$ac_cv_prog_cc_cross
echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
echo "configure:903: checking whether we are using GNU C" >&5
echo "configure:938: checking whether we are using GNU C" >&5
if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@ -908,7 +943,7 @@ else
yes;
#endif
EOF
if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:912: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:947: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
ac_cv_prog_gcc=yes
else
ac_cv_prog_gcc=no
@ -919,11 +954,15 @@ echo "$ac_t""$ac_cv_prog_gcc" 1>&6
if test $ac_cv_prog_gcc = yes; then
GCC=yes
ac_test_CFLAGS="${CFLAGS+set}"
ac_save_CFLAGS="$CFLAGS"
CFLAGS=
echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
echo "configure:927: checking whether ${CC-cc} accepts -g" >&5
else
GCC=
fi
ac_test_CFLAGS="${CFLAGS+set}"
ac_save_CFLAGS="$CFLAGS"
CFLAGS=
echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
echo "configure:966: checking whether ${CC-cc} accepts -g" >&5
if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@ -938,16 +977,20 @@ rm -f conftest*
fi
echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
if test "$ac_test_CFLAGS" = set; then
CFLAGS="$ac_save_CFLAGS"
elif test $ac_cv_prog_cc_g = yes; then
if test "$ac_test_CFLAGS" = set; then
CFLAGS="$ac_save_CFLAGS"
elif test $ac_cv_prog_cc_g = yes; then
if test "$GCC" = yes; then
CFLAGS="-g -O2"
else
CFLAGS="-O2"
CFLAGS="-g"
fi
else
GCC=
test "${CFLAGS+set}" = set || CFLAGS="-g"
if test "$GCC" = yes; then
CFLAGS="-O2"
else
CFLAGS=
fi
fi
# Find a good install program. We prefer a C program (faster),
@ -962,12 +1005,12 @@ fi
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
# ./install, which can be erroneously created by make from ./install.sh.
echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
echo "configure:966: checking for a BSD compatible install" >&5
echo "configure:1009: checking for a BSD compatible install" >&5
if test -z "$INSTALL"; then
if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS="${IFS}:"
IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS=":"
for ac_dir in $PATH; do
# Account for people who put trailing slashes in PATH elements.
case "$ac_dir/" in
@ -1013,7 +1056,7 @@ test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
echo "configure:1017: checking whether ${MAKE-make} sets \${MAKE}" >&5
echo "configure:1060: checking whether ${MAKE-make} sets \${MAKE}" >&5
set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@ -1042,14 +1085,14 @@ fi
# Extract the first word of "ranlib", so it can be a program name with args.
set dummy ranlib; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:1046: checking for $ac_word" >&5
echo "configure:1089: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
if test -n "$RANLIB"; then
ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
else
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
for ac_dir in $PATH; do
test -z "$ac_dir" && ac_dir=.
if test -f $ac_dir/$ac_word; then
@ -1071,7 +1114,7 @@ fi
echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
echo "configure:1075: checking how to run the C preprocessor" >&5
echo "configure:1118: checking how to run the C preprocessor" >&5
# On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then
CPP=
@ -1086,14 +1129,14 @@ else
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp.
cat > conftest.$ac_ext <<EOF
#line 1090 "configure"
#line 1133 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:1096: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
{ (eval echo configure:1139: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
else
@ -1103,14 +1146,31 @@ else
rm -rf conftest*
CPP="${CC-cc} -E -traditional-cpp"
cat > conftest.$ac_ext <<EOF
#line 1107 "configure"
#line 1150 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:1113: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
{ (eval echo configure:1156: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
else
echo "$ac_err" >&5
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
rm -rf conftest*
CPP="${CC-cc} -nologo -E"
cat > conftest.$ac_ext <<EOF
#line 1167 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:1173: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
else
@ -1122,6 +1182,8 @@ else
fi
rm -f conftest*
fi
rm -f conftest*
fi
rm -f conftest*
ac_cv_prog_CPP="$CPP"
fi
@ -1132,12 +1194,12 @@ fi
echo "$ac_t""$CPP" 1>&6
echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
echo "configure:1136: checking for ANSI C header files" >&5
echo "configure:1198: checking for ANSI C header files" >&5
if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 1141 "configure"
#line 1203 "configure"
#include "confdefs.h"
#include <stdlib.h>
#include <stdarg.h>
@ -1145,8 +1207,8 @@ else
#include <float.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:1149: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
{ (eval echo configure:1211: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
ac_cv_header_stdc=yes
@ -1162,7 +1224,7 @@ rm -f conftest*
if test $ac_cv_header_stdc = yes; then
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
cat > conftest.$ac_ext <<EOF
#line 1166 "configure"
#line 1228 "configure"
#include "confdefs.h"
#include <string.h>
EOF
@ -1180,7 +1242,7 @@ fi
if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
cat > conftest.$ac_ext <<EOF
#line 1184 "configure"
#line 1246 "configure"
#include "confdefs.h"
#include <stdlib.h>
EOF
@ -1201,7 +1263,7 @@ if test "$cross_compiling" = yes; then
:
else
cat > conftest.$ac_ext <<EOF
#line 1205 "configure"
#line 1267 "configure"
#include "confdefs.h"
#include <ctype.h>
#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@ -1212,7 +1274,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
exit (0); }
EOF
if { (eval echo configure:1216: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
if { (eval echo configure:1278: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
:
else
@ -1239,18 +1301,18 @@ for ac_hdr in fcntl.h sys/ioctl.h sys/time.h unistd.h sys/filio.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
echo "configure:1243: checking for $ac_hdr" >&5
echo "configure:1305: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 1248 "configure"
#line 1310 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:1253: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
{ (eval echo configure:1315: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
eval "ac_cv_header_$ac_safe=yes"
@ -1277,12 +1339,12 @@ done
echo $ac_n "checking for working const""... $ac_c" 1>&6
echo "configure:1281: checking for working const" >&5
echo "configure:1343: checking for working const" >&5
if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 1286 "configure"
#line 1348 "configure"
#include "confdefs.h"
int main() {
@ -1331,7 +1393,7 @@ ccp = (char const *const *) p;
; return 0; }
EOF
if { (eval echo configure:1335: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
if { (eval echo configure:1397: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_const=yes
else
@ -1352,12 +1414,12 @@ EOF
fi
echo $ac_n "checking for size_t""... $ac_c" 1>&6
echo "configure:1356: checking for size_t" >&5
echo "configure:1418: checking for size_t" >&5
if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 1361 "configure"
#line 1423 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
@ -1385,12 +1447,12 @@ EOF
fi
echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
echo "configure:1389: checking whether time.h and sys/time.h may both be included" >&5
echo "configure:1451: checking whether time.h and sys/time.h may both be included" >&5
if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 1394 "configure"
#line 1456 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/time.h>
@ -1399,7 +1461,7 @@ int main() {
struct tm *tp;
; return 0; }
EOF
if { (eval echo configure:1403: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
if { (eval echo configure:1465: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_header_time=yes
else
@ -1422,13 +1484,13 @@ fi
if test $ac_cv_prog_gcc = yes; then
echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6
echo "configure:1426: checking whether ${CC-cc} needs -traditional" >&5
echo "configure:1488: checking whether ${CC-cc} needs -traditional" >&5
if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_pattern="Autoconf.*'x'"
cat > conftest.$ac_ext <<EOF
#line 1432 "configure"
#line 1494 "configure"
#include "confdefs.h"
#include <sgtty.h>
Autoconf TIOCGETP
@ -1446,7 +1508,7 @@ rm -f conftest*
if test $ac_cv_prog_gcc_traditional = no; then
cat > conftest.$ac_ext <<EOF
#line 1450 "configure"
#line 1512 "configure"
#include "confdefs.h"
#include <termio.h>
Autoconf TCGETA
@ -1468,12 +1530,12 @@ echo "$ac_t""$ac_cv_prog_gcc_traditional" 1>&6
fi
echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
echo "configure:1472: checking return type of signal handlers" >&5
echo "configure:1534: checking return type of signal handlers" >&5
if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 1477 "configure"
#line 1539 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <signal.h>
@ -1490,7 +1552,7 @@ int main() {
int i;
; return 0; }
EOF
if { (eval echo configure:1494: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
if { (eval echo configure:1556: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_type_signal=void
else
@ -1509,12 +1571,12 @@ EOF
echo $ac_n "checking for vprintf""... $ac_c" 1>&6
echo "configure:1513: checking for vprintf" >&5
echo "configure:1575: checking for vprintf" >&5
if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 1518 "configure"
#line 1580 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char vprintf(); below. */
@ -1537,7 +1599,7 @@ vprintf();
; return 0; }
EOF
if { (eval echo configure:1541: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
if { (eval echo configure:1603: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_vprintf=yes"
else
@ -1561,12 +1623,12 @@ fi
if test "$ac_cv_func_vprintf" != yes; then
echo $ac_n "checking for _doprnt""... $ac_c" 1>&6
echo "configure:1565: checking for _doprnt" >&5
echo "configure:1627: checking for _doprnt" >&5
if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 1570 "configure"
#line 1632 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char _doprnt(); below. */
@ -1589,7 +1651,7 @@ _doprnt();
; return 0; }
EOF
if { (eval echo configure:1593: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
if { (eval echo configure:1655: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func__doprnt=yes"
else
@ -1616,12 +1678,12 @@ fi
for ac_func in gettimeofday select socket strtod strtoul memcpy memmove
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
echo "configure:1620: checking for $ac_func" >&5
echo "configure:1682: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 1625 "configure"
#line 1687 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@ -1644,7 +1706,7 @@ $ac_func();
; return 0; }
EOF
if { (eval echo configure:1648: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
if { (eval echo configure:1710: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@ -1670,7 +1732,7 @@ done
echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
echo "configure:1674: checking whether to enable maintainer-specific portions of Makefiles" >&5
echo "configure:1736: checking whether to enable maintainer-specific portions of Makefiles" >&5
# Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
if test "${enable_maintainer_mode+set}" = set; then
enableval="$enable_maintainer_mode"
@ -1687,49 +1749,49 @@ fi
fi
echo $ac_n "checking for Cygwin32 environment""... $ac_c" 1>&6
echo "configure:1692: checking for Cygwin32 environment" >&5
if eval "test \"`echo '$''{'am_cv_cygwin32'+set}'`\" = set"; then
echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
echo "configure:1754: checking for Cygwin environment" >&5
if eval "test \"`echo '$''{'am_cv_cygwin'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 1697 "configure"
#line 1759 "configure"
#include "confdefs.h"
int main() {
return __CYGWIN32__;
return __CYGWIN__;
; return 0; }
EOF
if { (eval echo configure:1704: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
if { (eval echo configure:1766: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
am_cv_cygwin32=yes
am_cv_cygwin=yes
else
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
rm -rf conftest*
am_cv_cygwin32=no
am_cv_cygwin=no
fi
rm -f conftest*
rm -f conftest*
fi
echo "$ac_t""$am_cv_cygwin32" 1>&6
CYGWIN32=
test "$am_cv_cygwin32" = yes && CYGWIN32=yes
echo "$ac_t""$am_cv_cygwin" 1>&6
CYGWIN=
test "$am_cv_cygwin" = yes && CYGWIN=yes
echo $ac_n "checking for Mingw32 environment""... $ac_c" 1>&6
echo "configure:1721: checking for Mingw32 environment" >&5
echo "configure:1783: checking for Mingw32 environment" >&5
if eval "test \"`echo '$''{'am_cv_mingw32'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 1726 "configure"
#line 1788 "configure"
#include "confdefs.h"
int main() {
return __MINGW32__;
; return 0; }
EOF
if { (eval echo configure:1733: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
if { (eval echo configure:1795: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
am_cv_mingw32=yes
else
@ -1748,11 +1810,11 @@ test "$am_cv_mingw32" = yes && MINGW32=yes
echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
echo "configure:1752: checking for executable suffix" >&5
echo "configure:1814: checking for executable suffix" >&5
if eval "test \"`echo '$''{'am_cv_exeext'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
if test "$CYGWIN32" = yes || test "$MINGW32" = yes; then
if test "$CYGWIN" = yes || test "$MINGW32" = yes; then
am_cv_exeext=.exe
else
cat > am_c_test.c << 'EOF'
@ -1761,7 +1823,14 @@ int main() {
}
EOF
${CC-cc} -o am_c_test $CFLAGS $CPPFLAGS $LDFLAGS am_c_test.c $LIBS 1>&5
am_cv_exeext=`echo am_c_test.* | grep -v am_c_test.c | sed -e s/am_c_test//`
am_cv_exeext=
for file in am_c_test.*; do
case $file in
*.c) ;;
*.o) ;;
*) am_cv_exeext=`echo $file | sed -e s/am_c_test//` ;;
esac
done
rm -f am_c_test*
fi
@ -1874,7 +1943,7 @@ do
echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
-version | --version | --versio | --versi | --vers | --ver | --ve | --v)
echo "$CONFIG_STATUS generated by autoconf version 2.12.1"
echo "$CONFIG_STATUS generated by autoconf version 2.12.2"
exit 0 ;;
-help | --help | --hel | --he | --h)
echo "\$ac_cs_usage"; exit 0 ;;

View File

@ -43,7 +43,7 @@
#endif
#if defined(_WIN32)
# define COMPILING_ON_WIN32 1
# if !defined(__CYGWIN32__)
# if !defined(__CYGWIN__)
# define COMPILING_ON_WINDOWS 1
# endif
#endif

View File

@ -546,7 +546,7 @@ static unsigned long tv_diff(const struct timeval *time_now,
- ((time_was->tv_sec * 1000000) + time_was->tv_usec) );
}
#if !defined(__unix) && !defined(__CYGWIN32__)
#if !defined(__unix) && !defined(__CYGWIN__)
static void gettimeofday( struct timeval *time_now, void *dummy )
{
time_t t = clock();

View File

@ -16,7 +16,7 @@
#define angsd_hostchan_h
/* struct timeval */
#if defined(__unix) || defined(__CYGWIN32__)
#if defined(__unix) || defined(__CYGWIN__)
# include <sys/time.h>
#else
# include "winsock.h"

View File

@ -243,7 +243,7 @@ static int SerialOpen(const char *name, const char *arg)
serial_reset();
#if defined(__unix) || defined(__CYGWIN32__)
#if defined(__unix) || defined(__CYGWIN__)
Unix_ioctlNonBlocking();
#endif

View File

@ -278,7 +278,7 @@ static int SerparOpen(const char *name, const char *arg)
serpar_reset();
#if defined(__unix) || defined(__CYGWIN32__)
#if defined(__unix) || defined(__CYGWIN__)
Unix_ioctlNonBlocking();
#endif

View File

@ -97,7 +97,7 @@
#define SERIAL_PREFIX "/dev/tty"
#if defined(_WIN32) || defined (__CYGWIN32__)
#if defined(_WIN32) || defined (__CYGWIN__)
#define SERPORT1 "com1"
#define SERPORT2 "com2"
#define PARPORT1 "lpt1"
@ -241,7 +241,7 @@ extern int Unix_IsSerialInUse(void)
extern int Unix_OpenSerial(const char *name)
{
#if defined(BSD) || defined(__CYGWIN32__)
#if defined(BSD) || defined(__CYGWIN__)
serpfd = open(name, O_RDWR);
#else
serpfd = open(name, O_RDWR | O_NONBLOCK);
@ -305,7 +305,7 @@ extern void Unix_ResetSerial(void)
struct termios terminfo;
tcgetattr(serpfd, &terminfo);
#ifdef __CYGWIN32__
#ifdef __CYGWIN__
/* Expedient, but it works. */
terminfo.c_iflag = 0;
terminfo.c_oflag = 0;

View File

@ -26,7 +26,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
#include <netdb.h>
#include <sys/socket.h>
#ifndef __CYGWIN32__
#ifndef __CYGWIN__
#include <netinet/tcp.h>
#endif

View File

@ -85,7 +85,7 @@ static int hardwire_setstopbits PARAMS ((serial_t, int));
void _initialize_ser_hardwire PARAMS ((void));
#ifdef __CYGWIN32__
#ifdef __CYGWIN__
extern void (*ui_loop_hook) PARAMS ((int));
#endif
@ -434,7 +434,7 @@ wait_for(scb, timeout)
serial_t scb;
int timeout;
{
#ifndef __CYGWIN32__
#ifndef __CYGWIN__
scb->timeout_remaining = 0;
#endif
@ -551,21 +551,21 @@ hardwire_readchar (scb, timeout)
int timeout;
{
int status;
#ifdef __CYGWIN32__
#ifdef __CYGWIN__
int t;
#endif
if (scb->bufcnt-- > 0)
return *scb->bufp++;
#ifdef __CYGWIN32__
#ifdef __CYGWIN__
if (timeout > 0)
timeout++;
#endif
while (1)
{
#ifdef __CYGWIN32__
#ifdef __CYGWIN__
t = timeout == 0 ? 0 : 1;
scb->timeout_remaining = timeout < 0 ? timeout : timeout - t;
status = wait_for (scb, t);
@ -592,7 +592,7 @@ hardwire_readchar (scb, timeout)
timeout = scb->timeout_remaining;
continue;
}
#ifdef __CYGWIN32__
#ifdef __CYGWIN__
else if (scb->timeout_remaining < 0)
continue;
#endif

View File

@ -379,7 +379,7 @@ static void stop_sig PARAMS ((int));
command file. */
void (*init_ui_hook) PARAMS ((char *argv0));
#ifdef __CYGWIN32__
#ifdef __CYGWIN__
void (*ui_loop_hook) PARAMS ((int));
#endif