Skip to content

W
wine-winehq
Commit ed2f19a6 authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files
Options

Put AC_DEFINE symbols definitions directly in the configure script so

that we no longer need an acconfig.h. Cleaned up dlopen() tests a bit.
parent e8f90883
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 115 additions and 266 deletions
Makefile.in
View file @ ed2f19a6
...@@ -150,11 +150,4 @@ distclean: clean ...@@ -150,11 +150,4 @@ distclean: clean
$(RM) config.* TAGS Make.rules dlls/Makedll.rules programs/Makeprog.rules include/config.h documentation/wine.man documentation/wine.conf.man tools/winelauncher $(RM) config.* TAGS Make.rules dlls/Makedll.rules programs/Makeprog.rules include/config.h documentation/wine.man documentation/wine.conf.man tools/winelauncher
$(RM) `find . \( -name Makefile -o -size 0 \) -print` $(RM) `find . \( -name Makefile -o -size 0 \) -print`
# We depend on configure above for checks, so we better don't use this rule.
#configure: configure.in
# autoconf
include/config.h.in: configure.in include/acconfig.h
autoheader -l include
### Dependencies: ### Dependencies:
configure
View file @ ed2f19a6
This source diff could not be displayed because it is too large. You can view the blob instead.
include/acconfig.h deleted 100644 → 0
View file @ e8f90883
/*
* This file is used by 'autoheader' to generate the list of symbols
* defined in the 'configure' script.
*/
/* Define if .type asm directive must be inside a .def directive */
#undef NEED_TYPE_IN_DEF
/* Define if symbols declared in assembly code need an underscore prefix */
#undef NEED_UNDERSCORE_PREFIX
/* Define to use .string instead of .ascii */
#undef HAVE_ASM_STRING
/* Define if struct msghdr contains msg_accrights */
#undef HAVE_MSGHDR_ACCRIGHTS
/* Define if struct sockaddr_un contains sun_len */
#undef HAVE_SOCKADDR_SUN_LEN
/* Define if you have the XKB extension */
#undef HAVE_XKB
/* Define if you have the Xxf86dga library (-lXxf86dga). */
#undef HAVE_LIBXXF86DGA
/* Define if you have the Xxf86dga library version 2.0 (-lXxf86dga). */
#undef HAVE_LIBXXF86DGA2
/* Define if you have the X Shm extension */
#undef HAVE_LIBXXSHM
/* Define if you have the X Shape extension */
#undef HAVE_LIBXSHAPE
/* Define if you have the Xxf86vm library */
#undef HAVE_LIBXXF86VM
/* Define if you have the Xpm library */
#undef HAVE_LIBXXPM
/* Define if you have the Open Sound system. */
#undef HAVE_OSS
/* Define if you have the Open Sound system (MIDI interface). */
#undef HAVE_OSS_MIDI
/* Define if X libraries are not reentrant (compiled without -D_REENTRANT). */
#undef NO_REENTRANT_X11
/* Define to the name of the function returning erro for reentrant libc */
#undef ERRNO_LOCATION
/* Define if all debug messages are to be compiled out */
#undef NO_DEBUG_MSGS
/* Define if TRACE messages are to be compiled out */
#undef NO_TRACE_MSGS
/* Define if the struct statfs has the member bavail */
#undef STATFS_HAS_BAVAIL
/* Define if the struct statfs has the member bfree */
#undef STATFS_HAS_BFREE
/* Define if the struct statfs is defined by <sys/vfs.h> */
#undef STATFS_DEFINED_BY_SYS_VFS
/* Define if the struct statfs is defined by <sys/statfs.h> */
#undef STATFS_DEFINED_BY_SYS_STATFS
/* Define if the struct statfs is defined by <sys/mount.h> */
#undef STATFS_DEFINED_BY_SYS_MOUNT
/* Define if we can use ncurses for full-screen access */
#undef HAVE_LIBNCURSES
/* Define if we can use curses (if no ncurses) for full-screen access */
#undef HAVE_LIBCURSES
/* Define if ncurses have the new resizeterm function */
#undef HAVE_RESIZETERM
/* Define if ncurses have the new getbkgd function */
#undef HAVE_GETBKGD
/* Define if we can a compatible xterm program */
#undef XTERM_PROGRAM
/* Define if IPX should use netipx/ipx.h from libc */
#undef HAVE_IPX_GNU
/* Define if IPX includes are taken from Linux kernel */
#undef HAVE_IPX_LINUX
/* Define if OpenGL is present on the system or not */
#undef HAVE_OPENGL
/* Define if the system has dynamic link library support with the dl* API */
#undef HAVE_DL_API
/* Define if <linux/joystick.h> defines the Linux 2.2 joystick API */
#undef HAVE_LINUX_22_JOYSTICK_API
/* Define if the OpenGL library supports the glXGetProcAddressARB call */
#undef HAVE_GLX_GETPROCADDRESS
/* Define if the OpenGL headers define extension typedefs */
#undef HAVE_GLEXT_PROTOTYPES
/* Define if the X libraries support XVideo */
#undef HAVE_XVIDEO
/* Define if Mesa's OSMesa (off-screen rendering) library is present */
#undef HAVE_OSMESA
/* Define if Linux-style gethostbyname_r and gethostbyaddr_r are available */
#undef HAVE_LINUX_GETHOSTBYNAME_R_6
/* Define if we have linux/input.h AND it contains the INPUT event API */
#undef HAVE_CORRECT_LINUXINPUT_H
/* Define if we have CUPS */
#undef HAVE_CUPS
/* Define if FreeType 2 is installed */
#undef HAVE_FREETYPE
include/config.h.in
View file @ ed2f19a6
...@@ -40,120 +40,6 @@ ...@@ -40,120 +40,6 @@
/* Define if the X Window System is missing or not being used. */ /* Define if the X Window System is missing or not being used. */
#undef X_DISPLAY_MISSING #undef X_DISPLAY_MISSING
/* Define if .type asm directive must be inside a .def directive */
#undef NEED_TYPE_IN_DEF
/* Define if symbols declared in assembly code need an underscore prefix */
#undef NEED_UNDERSCORE_PREFIX
/* Define to use .string instead of .ascii */
#undef HAVE_ASM_STRING
/* Define if struct msghdr contains msg_accrights */
#undef HAVE_MSGHDR_ACCRIGHTS
/* Define if struct sockaddr_un contains sun_len */
#undef HAVE_SOCKADDR_SUN_LEN
/* Define if you have the XKB extension */
#undef HAVE_XKB
/* Define if you have the Xxf86dga library (-lXxf86dga). */
#undef HAVE_LIBXXF86DGA
/* Define if you have the Xxf86dga library version 2.0 (-lXxf86dga). */
#undef HAVE_LIBXXF86DGA2
/* Define if you have the X Shm extension */
#undef HAVE_LIBXXSHM
/* Define if you have the X Shape extension */
#undef HAVE_LIBXSHAPE
/* Define if you have the Xxf86vm library */
#undef HAVE_LIBXXF86VM
/* Define if you have the Xpm library */
#undef HAVE_LIBXXPM
/* Define if you have the Open Sound system. */
#undef HAVE_OSS
/* Define if you have the Open Sound system (MIDI interface). */
#undef HAVE_OSS_MIDI
/* Define if X libraries are not reentrant (compiled without -D_REENTRANT). */
#undef NO_REENTRANT_X11
/* Define to the name of the function returning erro for reentrant libc */
#undef ERRNO_LOCATION
/* Define if all debug messages are to be compiled out */
#undef NO_DEBUG_MSGS
/* Define if TRACE messages are to be compiled out */
#undef NO_TRACE_MSGS
/* Define if the struct statfs has the member bavail */
#undef STATFS_HAS_BAVAIL
/* Define if the struct statfs has the member bfree */
#undef STATFS_HAS_BFREE
/* Define if the struct statfs is defined by <sys/vfs.h> */
#undef STATFS_DEFINED_BY_SYS_VFS
/* Define if the struct statfs is defined by <sys/statfs.h> */
#undef STATFS_DEFINED_BY_SYS_STATFS
/* Define if the struct statfs is defined by <sys/mount.h> */
#undef STATFS_DEFINED_BY_SYS_MOUNT
/* Define if ncurses have the new resizeterm function */
#undef HAVE_RESIZETERM
/* Define if ncurses have the new getbkgd function */
#undef HAVE_GETBKGD
/* Define if IPX should use netipx/ipx.h from libc */
#undef HAVE_IPX_GNU
/* Define if IPX includes are taken from Linux kernel */
#undef HAVE_IPX_LINUX
/* Define if OpenGL is present on the system or not */
#undef HAVE_OPENGL
/* Define if the system has dynamic link library support with the dl* API */
#undef HAVE_DL_API
/* Define if <linux/joystick.h> defines the Linux 2.2 joystick API */
#undef HAVE_LINUX_22_JOYSTICK_API
/* Define if the OpenGL library supports the glXGetProcAddressARB call */
#undef HAVE_GLX_GETPROCADDRESS
/* Define if the OpenGL headers define extension typedefs */
#undef HAVE_GLEXT_PROTOTYPES
/* Define if the X libraries support XVideo */
#undef HAVE_XVIDEO
/* Define if Mesa's OSMesa (off-screen rendering) library is present */
#undef HAVE_OSMESA
/* Define if Linux-style gethostbyname_r and gethostbyaddr_r are available */
#undef HAVE_LINUX_GETHOSTBYNAME_R_6
/* Define if we have linux/input.h AND it contains the INPUT event API */
#undef HAVE_CORRECT_LINUXINPUT_H
/* Define if we have CUPS */
#undef HAVE_CUPS
/* Define if FreeType 2 is installed */
#undef HAVE_FREETYPE
/* The number of bytes in a long long. */ /* The number of bytes in a long long. */
#undef SIZEOF_LONG_LONG #undef SIZEOF_LONG_LONG
...@@ -184,6 +70,9 @@ ...@@ -184,6 +70,9 @@
/* Define if you have the ftruncate64 function. */ /* Define if you have the ftruncate64 function. */
#undef HAVE_FTRUNCATE64 #undef HAVE_FTRUNCATE64
/* Define if you have the getbkgd function. */
#undef HAVE_GETBKGD
/* Define if you have the gethostbyname function. */ /* Define if you have the gethostbyname function. */
#undef HAVE_GETHOSTBYNAME #undef HAVE_GETHOSTBYNAME
...@@ -232,6 +121,9 @@ ...@@ -232,6 +121,9 @@
/* Define if you have the openpty function. */ /* Define if you have the openpty function. */
#undef HAVE_OPENPTY #undef HAVE_OPENPTY
/* Define if you have the resizeterm function. */
#undef HAVE_RESIZETERM
/* Define if you have the rfork function. */ /* Define if you have the rfork function. */
#undef HAVE_RFORK #undef HAVE_RFORK
...@@ -502,6 +394,9 @@ ...@@ -502,6 +394,9 @@
/* Define if you have the <ucontext.h> header file. */ /* Define if you have the <ucontext.h> header file. */
#undef HAVE_UCONTEXT_H #undef HAVE_UCONTEXT_H
/* Define if you have the GL library (-lGL). */
#undef HAVE_LIBGL
/* Define if you have the curses library (-lcurses). */ /* Define if you have the curses library (-lcurses). */
#undef HAVE_LIBCURSES #undef HAVE_LIBCURSES
...@@ -523,9 +418,111 @@ ...@@ -523,9 +418,111 @@
/* Define if you have the xpg4 library (-lxpg4). */ /* Define if you have the xpg4 library (-lxpg4). */
#undef HAVE_LIBXPG4 #undef HAVE_LIBXPG4
/* Define if all debug messages are to be compiled out */
#undef NO_DEBUG_MSGS
/* Define if TRACE messages are to be compiled out */
#undef NO_TRACE_MSGS
/* Define if you have the Xpm library */
#undef HAVE_LIBXXPM
/* Define if you have the XKB extension */
#undef HAVE_XKB
/* Define if you have the X Shm extension */
#undef HAVE_LIBXXSHM
/* Define if you have the X Shape extension */
#undef HAVE_LIBXSHAPE
/* Define if you have the Xxf86dga library version 2 */
#undef HAVE_LIBXXF86DGA2
/* Define if you have the Xxf86dga library version 1 */
#undef HAVE_LIBXXF86DGA
/* Define if you have the Xxf86vm library */
#undef HAVE_LIBXXF86VM
/* Define if the X libraries support XVideo */
#undef HAVE_XVIDEO
/* Define if OpenGL is present on the system */
#undef HAVE_OPENGL
/* Define if the OpenGL library supports the glXGetProcAddressARB call */
#undef HAVE_GLX_GETPROCADDRESS
/* Define if the OpenGL headers define extension typedefs */
#undef HAVE_GLEXT_PROTOTYPES
/* Define if we have CUPS */
#undef HAVE_CUPS
/* Define if FreeType 2 is installed */
#undef HAVE_FREETYPE
/* Define if we can use ppdev.h for parallel port access */ /* Define if we can use ppdev.h for parallel port access */
#undef HAVE_PPDEV #undef HAVE_PPDEV
/* Define if IPX should use netipx/ipx.h from libc */
#undef HAVE_IPX_GNU
/* Define if IPX includes are taken from Linux kernel */
#undef HAVE_IPX_LINUX
/* Define if you have the Open Sound system */
#undef HAVE_OSS
/* Define if you have the Open Sound system (MIDI interface) */
#undef HAVE_OSS_MIDI
/* Set this to 64 to enable 64-bit file support on Linux */ /* Set this to 64 to enable 64-bit file support on Linux */
#undef _FILE_OFFSET_BITS #undef _FILE_OFFSET_BITS
/* Define if .type asm directive must be inside a .def directive */
#undef NEED_TYPE_IN_DEF
/* Define if symbols declared in assembly code need an underscore prefix */
#undef NEED_UNDERSCORE_PREFIX
/* Define to use .string instead of .ascii */
#undef HAVE_ASM_STRING
/* Define to the name of the function returning errno for reentrant libc */
#undef ERRNO_LOCATION
/* Define if X libraries are not reentrant (compiled without -D_REENTRANT) */
#undef NO_REENTRANT_X11
/* Define if we have linux/input.h AND it contains the INPUT event API */
#undef HAVE_CORRECT_LINUXINPUT_H
/* Define if Linux-style gethostbyname_r and gethostbyaddr_r are available */
#undef HAVE_LINUX_GETHOSTBYNAME_R_6
/* Define if <linux/joystick.h> defines the Linux 2.2 joystick API */
#undef HAVE_LINUX_22_JOYSTICK_API
/* Define if the struct statfs is defined by <sys/vfs.h> */
#undef STATFS_DEFINED_BY_SYS_VFS
/* Define if the struct statfs is defined by <sys/statfs.h> */
#undef STATFS_DEFINED_BY_SYS_STATFS
/* Define if the struct statfs is defined by <sys/mount.h> */
#undef STATFS_DEFINED_BY_SYS_MOUNT
/* Define if the struct statfs has the member bfree */
#undef STATFS_HAS_BFREE
/* Define if the struct statfs has the member bavail */
#undef STATFS_HAS_BAVAIL
/* Define if struct msghdr contains msg_accrights */
#undef HAVE_MSGHDR_ACCRIGHTS
/* Define if struct sockaddr_un contains sun_len */
#undef HAVE_SOCKADDR_SUN_LEN
include/wine/port.h
View file @ ed2f19a6
...@@ -140,7 +140,7 @@ extern void *wine_dlopen( const char *filename, int flag, char *error, int error ...@@ -140,7 +140,7 @@ extern void *wine_dlopen( const char *filename, int flag, char *error, int error
extern void *wine_dlsym( void *handle, const char *symbol, char *error, int errorsize ); extern void *wine_dlsym( void *handle, const char *symbol, char *error, int errorsize );
extern int wine_dlclose( void *handle, char *error, int errorsize ); extern int wine_dlclose( void *handle, char *error, int errorsize );
#ifdef HAVE_DL_API #ifdef HAVE_DLFCN_H
#include <dlfcn.h> #include <dlfcn.h>
#else #else
#define RTLD_LAZY 0x001 #define RTLD_LAZY 0x001
......
library/port.c
View file @ ed2f19a6
...@@ -40,9 +40,6 @@ ...@@ -40,9 +40,6 @@
#ifdef HAVE_LIBUTIL_H #ifdef HAVE_LIBUTIL_H
# include <libutil.h> # include <libutil.h>
#endif #endif
#ifdef HAVE_DL_API
# include <dlfcn.h>
#endif
/*********************************************************************** /***********************************************************************
...@@ -449,7 +446,7 @@ void *wine_anon_mmap( void *start, size_t size, int prot, int flags ) ...@@ -449,7 +446,7 @@ void *wine_anon_mmap( void *start, size_t size, int prot, int flags )
*/ */
void *wine_dlopen( const char *filename, int flag, char *error, int errorsize ) void *wine_dlopen( const char *filename, int flag, char *error, int errorsize )
{ {
#ifdef HAVE_DL_API #ifdef HAVE_DLOPEN
void *ret; void *ret;
char *s; char *s;
dlerror(); dlerror(); dlerror(); dlerror();
...@@ -477,7 +474,7 @@ void *wine_dlopen( const char *filename, int flag, char *error, int errorsize ) ...@@ -477,7 +474,7 @@ void *wine_dlopen( const char *filename, int flag, char *error, int errorsize )
*/ */
void *wine_dlsym( void *handle, const char *symbol, char *error, int errorsize ) void *wine_dlsym( void *handle, const char *symbol, char *error, int errorsize )
{ {
#ifdef HAVE_DL_API #ifdef HAVE_DLOPEN
void *ret; void *ret;
char *s; char *s;
dlerror(); dlerror(); dlerror(); dlerror();
...@@ -505,7 +502,7 @@ void *wine_dlsym( void *handle, const char *symbol, char *error, int errorsize ) ...@@ -505,7 +502,7 @@ void *wine_dlsym( void *handle, const char *symbol, char *error, int errorsize )
*/ */
int wine_dlclose( void *handle, char *error, int errorsize ) int wine_dlclose( void *handle, char *error, int errorsize )
{ {
#ifdef HAVE_DL_API #ifdef HAVE_DLOPEN
int ret; int ret;
char *s; char *s;
dlerror(); dlerror(); dlerror(); dlerror();
......
loader/elf.c
View file @ ed2f19a6
...@@ -26,8 +26,6 @@ ...@@ -26,8 +26,6 @@
DEFAULT_DEBUG_CHANNEL(win32); DEFAULT_DEBUG_CHANNEL(win32);
#ifdef HAVE_DL_API
typedef struct { typedef struct {
WORD popl WINE_PACKED; /* 0x8f 0x05 */ WORD popl WINE_PACKED; /* 0x8f 0x05 */
DWORD addr_popped WINE_PACKED;/* ... */ DWORD addr_popped WINE_PACKED;/* ... */
...@@ -268,12 +266,3 @@ static FARPROC ELF_FindExportedFunction( WINE_MODREF *wm, LPCSTR funcName, BOOL ...@@ -268,12 +266,3 @@ static FARPROC ELF_FindExportedFunction( WINE_MODREF *wm, LPCSTR funcName, BOOL
fun = SNOOP_GetProcAddress(wm->module,funcName,stub-first_stub,fun); fun = SNOOP_GetProcAddress(wm->module,funcName,stub-first_stub,fun);
return (FARPROC)fun; return (FARPROC)fun;
} }
#else /* HAVE_DL_API */
WINE_MODREF *ELF_LoadLibraryExA( LPCSTR libname, DWORD flags)
{
return NULL;
}
#endif /* HAVE_DL_API */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment