From 53fa0d5433cda9a7071122568a56a17449fb4b1f Mon Sep 17 00:00:00 2001 From: Eric Pouech Date: Thu, 5 Feb 2004 01:27:38 +0000 Subject: [PATCH] - Fixed broken winedbg compilation on BSD. - Fixed some corner case handling in ELF list walking (reported by Robert Shearman). --- configure | 51 +- configure.ac | 2 + include/config.h.in | 1172 +++++++++++----------------------------- programs/winedbg/elf.c | 45 +- 4 files changed, 363 insertions(+), 907 deletions(-) diff --git a/configure b/configure index 44b7427ca9f..233aa4e25ac 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.58 for Wine 20040121. +# Generated by GNU Autoconf 2.59 for Wine 20040121. # # Report bugs to . # @@ -852,37 +852,26 @@ if test -n "$ac_init_help"; then Optional Features: --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --disable-win16 - do not include Win16 support - --disable-debug - compile out all debugging messages - --disable-trace - compile out TRACE messages + --disable-win16 do not include Win16 support + --disable-debug compile out all debugging messages + --disable-trace compile out TRACE messages Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) - --without-opengl - do not use OpenGL - --without-curses - do not use curses - --with-wine-tools= - use Wine tools from directory + --without-opengl do not use OpenGL + --without-curses do not use curses + --with-wine-tools= use Wine tools from directory --with-x use the X Window System Some influential environment variables: - CC - C compiler command - CFLAGS - C compiler flags - LDFLAGS - linker flags, e.g. -L if you have - libraries in a nonstandard directory - CPPFLAGS - C/C++ preprocessor flags, e.g. -I if you - have headers in a nonstandard directory - CPP - C preprocessor + CC C compiler command + CFLAGS C compiler flags + LDFLAGS linker flags, e.g. -L if you have libraries in a + nonstandard directory + CPPFLAGS C/C++ preprocessor flags, e.g. -I if you have + headers in a nonstandard directory + CPP C preprocessor Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. @@ -984,7 +973,7 @@ test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF Wine configure 20040121 -generated by GNU Autoconf 2.58 +generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation @@ -998,7 +987,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. It was created by Wine $as_me 20040121, which was -generated by GNU Autoconf 2.58. Invocation command line was +generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -15758,6 +15747,8 @@ done + + @@ -15804,7 +15795,9 @@ for ac_header in \ stdint.h \ strings.h \ sys/cdio.h \ + sys/elf32.h \ sys/errno.h \ + sys/exec_elf.h \ sys/file.h \ sys/filio.h \ sys/inttypes.h \ @@ -19436,7 +19429,7 @@ _ASBOX cat >&5 <<_CSEOF This file was extended by Wine $as_me 20040121, which was -generated by GNU Autoconf 2.58. Invocation command line was +generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -19499,7 +19492,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ Wine config.status 20040121 -configured by $0, generated by GNU Autoconf 2.58, +configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" Copyright (C) 2003 Free Software Foundation, Inc. diff --git a/configure.ac b/configure.ac index 4018a7ba30d..f9735791c59 100644 --- a/configure.ac +++ b/configure.ac @@ -1087,7 +1087,9 @@ AC_CHECK_HEADERS(\ stdint.h \ strings.h \ sys/cdio.h \ + sys/elf32.h \ sys/errno.h \ + sys/exec_elf.h \ sys/file.h \ sys/filio.h \ sys/inttypes.h \ diff --git a/include/config.h.in b/include/config.h.in index c4318c65599..2877a15ee2f 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -2,1395 +2,856 @@ #define __WINE_CONFIG_H -/* - Define to one of `_getb67', `GETB67', `getb67' for - Cray-2 and Cray-YMP systems. This function is required - for `alloca.c' support on those systems. */ +/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP + systems. This function is required for `alloca.c' support on those systems. + */ #undef CRAY_STACKSEG_END -/* - Define to 1 if using `alloca.c'. */ +/* Define to 1 if using `alloca.c'. */ #undef C_ALLOCA -/* - Define to 1 if you have `alloca', as - a function or macro. */ +/* Define to 1 if you have `alloca', as a function or macro. */ #undef HAVE_ALLOCA -/* - Define to 1 if you have and - it should be used (not on Ultrix). */ +/* Define to 1 if you have and it should be used (not on Ultrix). + */ #undef HAVE_ALLOCA_H -/* - Define if you have ALSA including devel headers - */ +/* Define if you have ALSA including devel headers */ #undef HAVE_ALSA -/* - Define to 1 if you have the - header file. */ +/* Define to 1 if you have the header file. */ #undef HAVE_ALSA_ASOUNDLIB_H -/* - Define to 1 if you have the - header file. */ +/* Define to 1 if you have the header file. */ #undef HAVE_ARPA_INET_H -/* - Define to 1 if you have the - header file. */ +/* Define to 1 if you have the header file. */ #undef HAVE_ARPA_NAMESER_H -/* - Define if you have ARTS sound server */ +/* Define if you have ARTS sound server */ #undef HAVE_ARTS -/* - Define to 1 if you have the