Skip to content

W
wine-fonts
Commit daa2886c authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files
Options

Updated configure to take advantage of new autoconf 2.53 features.

parent 7746e821
Hide whitespace changes
Inline Side-by-side
Showing with 201 additions and 199 deletions
Makefile.in
View file @ daa2886c
......@@ -184,7 +184,7 @@ clean::
$(RM) wine
distclean: clean
$(RM) config.* TAGS Make.rules dlls/Makedll.rules programs/Makeprog.rules include/config.h include/wine/version.h
$(RM) config.* TAGS Make.rules dlls/Makedll.rules programs/Makeprog.rules include/config.h
$(RM) `find . \( -name Makefile -o -size 0 \) -print`
### Dependencies:
configure
View file @ daa2886c
This source diff could not be displayed because it is too large. You can view the blob instead.
configure.ac
View file @ daa2886c
......@@ -4,7 +4,7 @@ dnl See ChangeLog file for detailed change history.
m4_define(WINE_VERSION,regexp(m4_include(VERSION),[version \([-.0-9A-Za-z]+\)],[\1]))
AC_PREREQ(2.50)
AC_PREREQ(2.53)
AC_INIT([Wine],WINE_VERSION)
AC_CONFIG_SRCDIR(server/atom.c)
AC_CONFIG_HEADERS(include/config.h)
......@@ -160,8 +160,8 @@ then
AC_DEFINE(HAVE_LIBXXSHM, 1, [Define if you have the X Shm extension]),,
$X_LIBS -lXext -lX11 $X_EXTRA_LIBS)
],
AC_MSG_WARN([[XShm extension not found, Wine will be built without it]])
)
AC_MSG_WARN([[XShm extension not found, Wine will be built without it]]),
[#include <X11/Xlib.h>])
dnl *** Check for X shape extension
AC_CHECK_HEADERS(X11/extensions/shape.h,
......@@ -170,8 +170,8 @@ then
AC_DEFINE(HAVE_LIBXSHAPE, 1, [Define if you have the X Shape extension]),,
$X_LIBS -lXext -lX11 $X_EXTRA_LIBS)
],
AC_MSG_WARN([[XShape extension not found, Wine will be built without it]])
)
AC_MSG_WARN([[XShape extension not found, Wine will be built without it]]),
[#include <X11/Xlib.h>])
dnl *** Check for XFree86 DGA / DGA 2.0 extension
AC_CHECK_HEADERS(X11/extensions/xf86dga.h,
......@@ -196,8 +196,8 @@ then
$X_LIBS -lXext -lX11 $X_EXTRA_LIBS
)
],
AC_MSG_WARN([[DGA extension not found, Wine will be built without it]])
)
AC_MSG_WARN([[DGA extension not found, Wine will be built without it]]),
[#include <X11/Xlib.h>])
dnl *** Check for XFree86 VMODE extension
AC_CHECK_HEADERS(X11/extensions/xf86vmode.h,
......@@ -209,8 +209,8 @@ then
$X_LIBS -lXext -lX11 $X_EXTRA_LIBS
)
],
AC_MSG_WARN([[XFree86 VMODE extension not found, Wine will be built without it]])
)
AC_MSG_WARN([[XFree86 VMODE extension not found, Wine will be built without it]]),
[#include <X11/Xlib.h>])
dnl *** Check for XVideo extension supporting XvImages
AC_CHECK_HEADERS(X11/extensions/Xvlib.h,
......@@ -222,8 +222,8 @@ then
$X_LIBS -lXext -lX11 $X_EXTRA_LIBS
)
],
AC_MSG_WARN([[XVideo extension not found, Wine will be built without it]])
)
AC_MSG_WARN([[XVideo extension not found, Wine will be built without it]]),
[#include <X11/Xlib.h>])
dnl *** Check for XRender extension
AC_CHECK_HEADERS(X11/extensions/Xrender.h,
......@@ -235,8 +235,8 @@ then
$X_LIBS -lXext -lX11 $X_EXTRA_LIBS
)
],
AC_MSG_WARN([[XRender extension not found, Wine will be built without it]])
)
AC_MSG_WARN([[XRender extension not found, Wine will be built without it]]),
[#include <X11/Xlib.h>])
]
) dnl *** End of X11/Xlib.h check
......@@ -250,9 +250,10 @@ then
This prevents linking to OpenGL. Delete the file and restart configure.])
fi
AC_CHECK_HEADERS(GL/gl.h GL/glx.h GL/glext.h)
AC_CHECK_HEADERS(GL/gl.h GL/glx.h)
if test "$ac_cv_header_GL_gl_h" = "yes" -a "$ac_cv_header_GL_glx_h" = "yes"
then
AC_CHECK_HEADERS(GL/glext.h,,,[#include <GL/glx.h>])
dnl Check for some problems due to old Mesa versions
AC_CACHE_CHECK([for up-to-date OpenGL version], wine_cv_opengl_version_OK,
AC_TRY_COMPILE(
......@@ -1269,21 +1270,6 @@ WINE_CONFIG_EXTRA_DIR(include/wine)
WINE_CONFIG_EXTRA_DIR(programs/regapi/tests)
WINE_CONFIG_EXTRA_DIR(programs/winetest/tests)
AC_CONFIG_COMMANDS([include/wine/version.h],
[AC_MSG_NOTICE([creating include/wine/version.h])
cat >$tmp/version.h <<CEOF
/* Generated automatically by configure; DO NOT EDIT! */
#define WINE_RELEASE_INFO "Wine version $wine_version"
CEOF
if cmp -s $tmp/version.h include/wine/version.h 2>/dev/null; then
AC_MSG_NOTICE([include/wine/version.h is unchanged])
rm -f $tmp/version.h
else
rm -f include/wine/version.h
mv $tmp/version.h include/wine/version.h
fi],
[wine_version=$PACKAGE_VERSION])
MAKE_RULES=Make.rules
AC_SUBST_FILE(MAKE_RULES)
......@@ -1298,7 +1284,6 @@ Make.rules
dlls/Makedll.rules
programs/Makeprog.rules
Makefile
console/Makefile
controls/Makefile
debugger/Makefile
dlls/Makefile
......
include/config.h.in
View file @ daa2886c
/* include/config.h.in. Generated automatically from configure.ac by autoheader. */
/* include/config.h.in. Generated from configure.ac by autoheader. */
#define __WINE_CONFIG_H
......@@ -7,22 +7,23 @@
*/
#undef CRAY_STACKSEG_END
/* Define if using `alloca.c'. */
/* Define to 1 if using `alloca.c'. */
#undef C_ALLOCA
/* Define to the name of the function returning errno for reentrant libc */
#undef ERRNO_LOCATION
/* Define 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 if you have <alloca.h> and it should be used (not on Ultrix). */
/* Define to 1 if you have <alloca.h> and it should be used (not on Ultrix).
*/
#undef HAVE_ALLOCA_H
/* Define if you have the <arpa/inet.h> header file. */
/* Define to 1 if you have the <arpa/inet.h> header file. */
#undef HAVE_ARPA_INET_H
/* Define if you have the <arpa/nameser.h> header file. */
/* Define to 1 if you have the <arpa/nameser.h> header file. */
#undef HAVE_ARPA_NAMESER_H
/* Define if you have ARTS sound server */
......@@ -31,10 +32,10 @@
/* Define to use .string instead of .ascii */
#undef HAVE_ASM_STRING
/* Define if you have the `clone' function. */
/* Define to 1 if you have the `clone' function. */
#undef HAVE_CLONE
/* Define if you have the `connect' function. */
/* Define to 1 if you have the `connect' function. */
#undef HAVE_CONNECT
/* Define if we have linux/input.h AND it contains the INPUT event API */
......@@ -43,94 +44,94 @@
/* Define if we have CUPS */
#undef HAVE_CUPS
/* Define if you have the <curses.h> header file. */
/* Define to 1 if you have the <curses.h> header file. */
#undef HAVE_CURSES_H
/* Define if you have the <direct.h> header file. */
/* Define to 1 if you have the <direct.h> header file. */
#undef HAVE_DIRECT_H
/* Define if you have the <dlfcn.h> header file. */
/* Define to 1 if you have the <dlfcn.h> header file. */
#undef HAVE_DLFCN_H
/* Define if you have dlopen */
#undef HAVE_DLOPEN
/* Define if you have the `ecvt' function. */
/* Define to 1 if you have the `ecvt' function. */
#undef HAVE_ECVT
/* Define if you have the <elf.h> header file. */
/* Define to 1 if you have the <elf.h> header file. */
#undef HAVE_ELF_H
/* Define if you have the `finite' function. */
/* Define to 1 if you have the `finite' function. */
#undef HAVE_FINITE
/* Define if you have the <float.h> header file. */
/* Define to 1 if you have the <float.h> header file. */
#undef HAVE_FLOAT_H
/* Define if you have the `fpclass' function. */
/* Define to 1 if you have the `fpclass' function. */
#undef HAVE_FPCLASS
/* Define if FreeType 2 is installed */
#undef HAVE_FREETYPE
/* Define if you have the <freetype/freetype.h> header file. */
/* Define to 1 if you have the <freetype/freetype.h> header file. */
#undef HAVE_FREETYPE_FREETYPE_H
/* Define if you have the <freetype/ftglyph.h> header file. */
/* Define to 1 if you have the <freetype/ftglyph.h> header file. */
#undef HAVE_FREETYPE_FTGLYPH_H
/* Define if you have the <freetype/ftnames.h> header file. */
/* Define to 1 if you have the <freetype/ftnames.h> header file. */
#undef HAVE_FREETYPE_FTNAMES_H
/* Define if you have the <freetype/ftoutln.h> header file. */
/* Define to 1 if you have the <freetype/ftoutln.h> header file. */
#undef HAVE_FREETYPE_FTOUTLN_H
/* Define if you have the <freetype/ftsnames.h> header file. */
/* Define to 1 if you have the <freetype/ftsnames.h> header file. */
#undef HAVE_FREETYPE_FTSNAMES_H
/* Define if you have the <freetype/fttrigon.h> header file. */
#undef HAVE_FREETYPE_FTTRIGON_H
/* Define if you have the <freetype/internal/sfnt.h> header file. */
/* Define to 1 if you have the <freetype/internal/sfnt.h> header file. */
#undef HAVE_FREETYPE_INTERNAL_SFNT_H
/* Define if you have the <freetype/ttnameid.h> header file. */
/* Define to 1 if you have the <freetype/ttnameid.h> header file. */
#undef HAVE_FREETYPE_TTNAMEID_H
/* Define if you have the <freetype/tttables.h> header file. */
/* Define to 1 if you have the <freetype/tttables.h> header file. */
#undef HAVE_FREETYPE_TTTABLES_H
/* Define if you have the `ftruncate64' function. */
/* Define to 1 if you have the `ftruncate64' function. */
#undef HAVE_FTRUNCATE64
/* Define if you have the `getbkgd' function. */
/* Define to 1 if you have the `getbkgd' function. */
#undef HAVE_GETBKGD
/* Define if you have the `gethostbyname' function. */
/* Define to 1 if you have the `gethostbyname' function. */
#undef HAVE_GETHOSTBYNAME
/* Define if you have the `getnetbyaddr' function. */
/* Define to 1 if you have the `getnetbyaddr' function. */
#undef HAVE_GETNETBYADDR
/* Define if you have the `getnetbyname' function. */
/* Define to 1 if you have the `getnetbyname' function. */
#undef HAVE_GETNETBYNAME
/* Define if you have the `getpagesize' function. */
/* Define to 1 if you have the `getpagesize' function. */
#undef HAVE_GETPAGESIZE
/* Define if you have the `getprotobyname' function. */
/* Define to 1 if you have the `getprotobyname' function. */
#undef HAVE_GETPROTOBYNAME
/* Define if you have the `getprotobynumber' function. */
/* Define to 1 if you have the `getprotobynumber' function. */
#undef HAVE_GETPROTOBYNUMBER
/* Define if you have the `getrlimit' function. */
/* Define to 1 if you have the `getrlimit' function. */
#undef HAVE_GETRLIMIT
/* Define if you have the `getservbyport' function. */
/* Define to 1 if you have the `getservbyport' function. */
#undef HAVE_GETSERVBYPORT
/* Define if you have the `getsockopt' function. */
/* Define to 1 if you have the `getsockopt' function. */
#undef HAVE_GETSOCKOPT
/* Define if the OpenGL headers define extension typedefs */
......@@ -139,28 +140,28 @@
/* Define if the OpenGL library supports the glXGetProcAddressARB call */
#undef HAVE_GLX_GETPROCADDRESS
/* Define if you have the <GL/glext.h> header file. */
/* Define to 1 if you have the <GL/glext.h> header file. */
#undef HAVE_GL_GLEXT_H
/* Define if you have the <GL/glx.h> header file. */
/* Define to 1 if you have the <GL/glx.h> header file. */
#undef HAVE_GL_GLX_H
/* Define if you have the <GL/gl.h> header file. */
/* Define to 1 if you have the <GL/gl.h> header file. */
#undef HAVE_GL_GL_H
/* Define if you have the <ieeefp.h> header file. */
/* Define to 1 if you have the <ieeefp.h> header file. */
#undef HAVE_IEEEFP_H
/* Define if you have the `inet_aton' function. */
/* Define to 1 if you have the `inet_aton' function. */
#undef HAVE_INET_ATON
/* Define if you have the `inet_network' function. */
/* Define to 1 if you have the `inet_network' function. */
#undef HAVE_INET_NETWORK
/* Define if you have the <inttypes.h> header file. */
/* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H
/* Define if you have the <io.h> header file. */
/* Define to 1 if you have the <io.h> header file. */
#undef HAVE_IO_H
/* Define if IPX should use netipx/ipx.h from libc */
......@@ -169,52 +170,52 @@
/* Define if IPX includes are taken from Linux kernel */
#undef HAVE_IPX_LINUX
/* Define if you have the `iswalnum' function. */
/* Define to 1 if you have the `iswalnum' function. */
#undef HAVE_ISWALNUM
/* Define if you have the <jpeglib.h> header file. */
/* Define to 1 if you have the <jpeglib.h> header file. */
#undef HAVE_JPEGLIB_H
/* Define if you have the curses library (-lcurses) */
#undef HAVE_LIBCURSES
/* Define if you have the `i386' library (-li386). */
/* Define to 1 if you have the `i386' library (-li386). */
#undef HAVE_LIBI386
/* Define if you have the <libio.h> header file. */
/* Define to 1 if you have the <libio.h> header file. */
#undef HAVE_LIBIO_H
/* Define if you have libjpeg including devel headers */
#undef HAVE_LIBJPEG
/* Define if you have the `m' library (-lm). */
/* Define to 1 if you have the `m' library (-lm). */
#undef HAVE_LIBM
/* Define if you have the `mmap' library (-lmmap). */
/* Define to 1 if you have the `mmap' library (-lmmap). */
#undef HAVE_LIBMMAP
/* Define if you have the ncurses library (-lncurses) */
#undef HAVE_LIBNCURSES
/* Define if you have the `nsl' library (-lnsl). */
/* Define to 1 if you have the `nsl' library (-lnsl). */
#undef HAVE_LIBNSL
/* Define if you have the `ossaudio' library (-lossaudio). */
/* Define to 1 if you have the `ossaudio' library (-lossaudio). */
#undef HAVE_LIBOSSAUDIO
/* Define if you have the `resolv' library (-lresolv). */
/* Define to 1 if you have the `resolv' library (-lresolv). */
#undef HAVE_LIBRESOLV
/* Define if you have the `socket' library (-lsocket). */
/* Define to 1 if you have the `socket' library (-lsocket). */
#undef HAVE_LIBSOCKET
/* Define if you have the <libutil.h> header file. */
/* Define to 1 if you have the <libutil.h> header file. */
#undef HAVE_LIBUTIL_H
/* Define if you have the `w' library (-lw). */
/* Define to 1 if you have the `w' library (-lw). */
#undef HAVE_LIBW
/* Define if you have the `xpg4' library (-lxpg4). */
/* Define to 1 if you have the `xpg4' library (-lxpg4). */
#undef HAVE_LIBXPG4
/* Define if you have the XRender extension library */
......@@ -235,76 +236,76 @@
/* Define if you have the X Shm extension */
#undef HAVE_LIBXXSHM
/* Define if you have the <link.h> header file. */
/* Define to 1 if you have the <link.h> header file. */
#undef HAVE_LINK_H
/* Define if <linux/joystick.h> defines the Linux 2.2 joystick API */
#undef HAVE_LINUX_22_JOYSTICK_API
/* Define if you have the <linux/cdrom.h> header file. */
/* Define to 1 if you have the <linux/cdrom.h> header file. */
#undef HAVE_LINUX_CDROM_H
/* Define if Linux-style gethostbyname_r and gethostbyaddr_r are available */
#undef HAVE_LINUX_GETHOSTBYNAME_R_6
/* Define if you have the <linux/input.h> header file. */
/* Define to 1 if you have the <linux/input.h> header file. */
#undef HAVE_LINUX_INPUT_H
/* Define if you have the <linux/joystick.h> header file. */
/* Define to 1 if you have the <linux/joystick.h> header file. */
#undef HAVE_LINUX_JOYSTICK_H
/* Define if you have the <linux/serial.h> header file. */
/* Define to 1 if you have the <linux/serial.h> header file. */
#undef HAVE_LINUX_SERIAL_H
/* Define if you have the <linux/ucdrom.h> header file. */
/* Define to 1 if you have the <linux/ucdrom.h> header file. */
#undef HAVE_LINUX_UCDROM_H
/* Define if you have the `lseek64' function. */
/* Define to 1 if you have the `lseek64' function. */
#undef HAVE_LSEEK64
/* Define if you have the `lstat' function. */
/* Define to 1 if you have the `lstat' function. */
#undef HAVE_LSTAT
/* Define if you have the <machine/soundcard.h> header file. */
/* Define to 1 if you have the <machine/soundcard.h> header file. */
#undef HAVE_MACHINE_SOUNDCARD_H
/* Define if you have the `memmove' function. */
/* Define to 1 if you have the `memmove' function. */
#undef HAVE_MEMMOVE
/* Define if you have the <memory.h> header file. */
/* Define to 1 if you have the <memory.h> header file. */
#undef HAVE_MEMORY_H
/* Define if you have the `mmap' function. */
/* Define to 1 if you have the `mmap' function. */
#undef HAVE_MMAP
/* Define if struct msghdr contains msg_accrights */
#undef HAVE_MSGHDR_ACCRIGHTS
/* Define if you have the <ncurses.h> header file. */
/* Define to 1 if you have the <ncurses.h> header file. */
#undef HAVE_NCURSES_H
/* Define if you have the <netdb.h> header file. */
/* Define to 1 if you have the <netdb.h> header file. */
#undef HAVE_NETDB_H
/* Define if you have the <netinet/in.h> header file. */
/* Define to 1 if you have the <netinet/in.h> header file. */
#undef HAVE_NETINET_IN_H
/* Define if you have the <netinet/in_systm.h> header file. */
/* Define to 1 if you have the <netinet/in_systm.h> header file. */
#undef HAVE_NETINET_IN_SYSTM_H
/* Define if you have the <netinet/ip.h> header file. */
/* Define to 1 if you have the <netinet/ip.h> header file. */
#undef HAVE_NETINET_IP_H
/* Define if you have the <netinet/tcp.h> header file. */
/* Define to 1 if you have the <netinet/tcp.h> header file. */
#undef HAVE_NETINET_TCP_H
/* Define if you have the <net/if.h> header file. */
/* Define to 1 if you have the <net/if.h> header file. */
#undef HAVE_NET_IF_H
/* Define if OpenGL is present on the system */
#undef HAVE_OPENGL
/* Define if you have the `openpty' function. */
/* Define to 1 if you have the `openpty' function. */
#undef HAVE_OPENPTY
/* Define if you have the Open Sound system */
......@@ -313,49 +314,49 @@
/* Define if you have the Open Sound system (MIDI interface) */
#undef HAVE_OSS_MIDI
/* Define if you have the `pclose' function. */
/* Define to 1 if you have the `pclose' function. */
#undef HAVE_PCLOSE
/* Define if you have the `popen' function. */
/* Define to 1 if you have the `popen' function. */
#undef HAVE_POPEN
/* Define if we can use ppdev.h for parallel port access */
#undef HAVE_PPDEV
/* Define if you have the `pread' function. */
/* Define to 1 if you have the `pread' function. */
#undef HAVE_PREAD
/* Define if you have the <pty.h> header file. */
/* Define to 1 if you have the <pty.h> header file. */
#undef HAVE_PTY_H
/* Define if you have the `pwrite' function. */
/* Define to 1 if you have the `pwrite' function. */
#undef HAVE_PWRITE
/* Define if you have the `resizeterm' function. */
/* Define to 1 if you have the `resizeterm' function. */
#undef HAVE_RESIZETERM
/* Define if you have the <resolv.h> header file. */
/* Define to 1 if you have the <resolv.h> header file. */
#undef HAVE_RESOLV_H
/* Define if you have the `rfork' function. */
/* Define to 1 if you have the `rfork' function. */
#undef HAVE_RFORK
/* Define if we have SANE development environment */
#undef HAVE_SANE
/* Define if you have the <sched.h> header file. */
/* Define to 1 if you have the <sched.h> header file. */
#undef HAVE_SCHED_H
/* Define if you have the `select' function. */
/* Define to 1 if you have the `select' function. */
#undef HAVE_SELECT
/* Define if you have the `sendmsg' function. */
/* Define to 1 if you have the `sendmsg' function. */
#undef HAVE_SENDMSG
/* Define if you have the `settimeofday' function. */
/* Define to 1 if you have the `settimeofday' function. */
#undef HAVE_SETTIMEOFDAY
/* Define if you have the `sigaltstack' function. */
/* Define to 1 if you have the `sigaltstack' function. */
#undef HAVE_SIGALTSTACK
/* Define if struct sockaddr contains sa_len */
......@@ -364,181 +365,181 @@
/* Define if struct sockaddr_un contains sun_len */
#undef HAVE_SOCKADDR_SUN_LEN
/* Define if you have the <socket.h> header file. */
/* Define to 1 if you have the <socket.h> header file. */
#undef HAVE_SOCKET_H
/* Define if you have the <soundcard.h> header file. */
/* Define to 1 if you have the <soundcard.h> header file. */
#undef HAVE_SOUNDCARD_H
/* Define if you have the `statfs' function. */
/* Define to 1 if you have the `statfs' function. */
#undef HAVE_STATFS
/* Define if you have the <stdint.h> header file. */
/* Define to 1 if you have the <stdint.h> header file. */
#undef HAVE_STDINT_H
/* Define if you have the <stdlib.h> header file. */
/* Define to 1 if you have the <stdlib.h> header file. */
#undef HAVE_STDLIB_H
/* Define if you have the `strcasecmp' function. */
/* Define to 1 if you have the `strcasecmp' function. */
#undef HAVE_STRCASECMP
/* Define if you have the `strerror' function. */
/* Define to 1 if you have the `strerror' function. */
#undef HAVE_STRERROR
/* Define if you have the <strings.h> header file. */
/* Define to 1 if you have the <strings.h> header file. */
#undef HAVE_STRINGS_H
/* Define if you have the <string.h> header file. */
/* Define to 1 if you have the <string.h> header file. */
#undef HAVE_STRING_H
/* Define if you have the `strncasecmp' function. */
/* Define to 1 if you have the `strncasecmp' function. */
#undef HAVE_STRNCASECMP
/* Define if you have the <syscall.h> header file. */
/* Define to 1 if you have the <syscall.h> header file. */
#undef HAVE_SYSCALL_H
/* Define if you have the <sys/cdio.h> header file. */
/* Define to 1 if you have the <sys/cdio.h> header file. */
#undef HAVE_SYS_CDIO_H
/* Define if you have the <sys/errno.h> header file. */
/* Define to 1 if you have the <sys/errno.h> header file. */
#undef HAVE_SYS_ERRNO_H
/* Define if you have the <sys/file.h> header file. */
/* Define to 1 if you have the <sys/file.h> header file. */
#undef HAVE_SYS_FILE_H
/* Define if you have the <sys/filio.h> header file. */
/* Define to 1 if you have the <sys/filio.h> header file. */
#undef HAVE_SYS_FILIO_H
/* Define if you have the <sys/inttypes.h> header file. */
/* Define to 1 if you have the <sys/inttypes.h> header file. */
#undef HAVE_SYS_INTTYPES_H
/* Define if you have the <sys/ipc.h> header file. */
/* Define to 1 if you have the <sys/ipc.h> header file. */
#undef HAVE_SYS_IPC_H
/* Define if you have the <sys/link.h> header file. */
/* Define to 1 if you have the <sys/link.h> header file. */
#undef HAVE_SYS_LINK_H
/* Define if you have the <sys/lwp.h> header file. */
/* Define to 1 if you have the <sys/lwp.h> header file. */
#undef HAVE_SYS_LWP_H
/* Define if you have the <sys/mman.h> header file. */
/* Define to 1 if you have the <sys/mman.h> header file. */
#undef HAVE_SYS_MMAN_H
/* Define if you have the <sys/modem.h> header file. */
/* Define to 1 if you have the <sys/modem.h> header file. */
#undef HAVE_SYS_MODEM_H
/* Define if you have the <sys/mount.h> header file. */
/* Define to 1 if you have the <sys/mount.h> header file. */
#undef HAVE_SYS_MOUNT_H
/* Define if you have the <sys/msg.h> header file. */
/* Define to 1 if you have the <sys/msg.h> header file. */
#undef HAVE_SYS_MSG_H
/* Define if you have the <sys/param.h> header file. */
/* Define to 1 if you have the <sys/param.h> header file. */
#undef HAVE_SYS_PARAM_H
/* Define if you have the <sys/ptrace.h> header file. */
/* Define to 1 if you have the <sys/ptrace.h> header file. */
#undef HAVE_SYS_PTRACE_H
/* Define if you have the <sys/reg.h> header file. */
/* Define to 1 if you have the <sys/reg.h> header file. */
#undef HAVE_SYS_REG_H
/* Define if you have the <sys/shm.h> header file. */
/* Define to 1 if you have the <sys/shm.h> header file. */
#undef HAVE_SYS_SHM_H
/* Define if you have the <sys/signal.h> header file. */
/* Define to 1 if you have the <sys/signal.h> header file. */
#undef HAVE_SYS_SIGNAL_H
/* Define if you have the <sys/socket.h> header file. */
/* Define to 1 if you have the <sys/socket.h> header file. */
#undef HAVE_SYS_SOCKET_H
/* Define if you have the <sys/sockio.h> header file. */
/* Define to 1 if you have the <sys/sockio.h> header file. */
#undef HAVE_SYS_SOCKIO_H
/* Define if you have the <sys/soundcard.h> header file. */
/* Define to 1 if you have the <sys/soundcard.h> header file. */
#undef HAVE_SYS_SOUNDCARD_H
/* Define if you have the <sys/statfs.h> header file. */
/* Define to 1 if you have the <sys/statfs.h> header file. */
#undef HAVE_SYS_STATFS_H
/* Define if you have the <sys/stat.h> header file. */
/* Define to 1 if you have the <sys/stat.h> header file. */
#undef HAVE_SYS_STAT_H
/* Define if you have the <sys/strtio.h> header file. */
/* Define to 1 if you have the <sys/strtio.h> header file. */
#undef HAVE_SYS_STRTIO_H
/* Define if you have the <sys/syscall.h> header file. */
/* Define to 1 if you have the <sys/syscall.h> header file. */
#undef HAVE_SYS_SYSCALL_H
/* Define if you have the <sys/time.h> header file. */
/* Define to 1 if you have the <sys/time.h> header file. */
#undef HAVE_SYS_TIME_H
/* Define if you have the <sys/types.h> header file. */
/* Define to 1 if you have the <sys/types.h> header file. */
#undef HAVE_SYS_TYPES_H
/* Define if you have the <sys/user.h> header file. */
/* Define to 1 if you have the <sys/user.h> header file. */
#undef HAVE_SYS_USER_H
/* Define if you have the <sys/v86intr.h> header file. */
/* Define to 1 if you have the <sys/v86intr.h> header file. */
#undef HAVE_SYS_V86INTR_H
/* Define if you have the <sys/v86.h> header file. */
/* Define to 1 if you have the <sys/v86.h> header file. */
#undef HAVE_SYS_V86_H
/* Define if you have the <sys/vfs.h> header file. */
/* Define to 1 if you have the <sys/vfs.h> header file. */
#undef HAVE_SYS_VFS_H
/* Define if you have the <sys/vm86.h> header file. */
/* Define to 1 if you have the <sys/vm86.h> header file. */
#undef HAVE_SYS_VM86_H
/* Define if you have the <sys/wait.h> header file. */
/* Define to 1 if you have the <sys/wait.h> header file. */
#undef HAVE_SYS_WAIT_H
/* Define if you have the `tcgetattr' function. */
/* Define to 1 if you have the `tcgetattr' function. */
#undef HAVE_TCGETATTR
/* Define if you have the `timegm' function. */
/* Define to 1 if you have the `timegm' function. */
#undef HAVE_TIMEGM
/* Define if you have the <ucontext.h> header file. */
/* Define to 1 if you have the <ucontext.h> header file. */
#undef HAVE_UCONTEXT_H
/* Define if you have the <unistd.h> header file. */
/* Define to 1 if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H
/* Define if you have the `usleep' function. */
/* Define to 1 if you have the `usleep' function. */
#undef HAVE_USLEEP
/* Define if you have the `vfscanf' function. */
/* Define to 1 if you have the `vfscanf' function. */
#undef HAVE_VFSCANF
/* Define if you have the `wait4' function. */
/* Define to 1 if you have the `wait4' function. */
#undef HAVE_WAIT4
/* Define if you have the `waitpid' function. */
/* Define to 1 if you have the `waitpid' function. */
#undef HAVE_WAITPID
/* Define if you have the <X11/extensions/shape.h> header file. */
/* Define to 1 if you have the <X11/extensions/shape.h> header file. */
#undef HAVE_X11_EXTENSIONS_SHAPE_H
/* Define if you have the <X11/extensions/xf86dga.h> header file. */
/* Define to 1 if you have the <X11/extensions/xf86dga.h> header file. */
#undef HAVE_X11_EXTENSIONS_XF86DGA_H
/* Define if you have the <X11/extensions/xf86vmode.h> header file. */
/* Define to 1 if you have the <X11/extensions/xf86vmode.h> header file. */
#undef HAVE_X11_EXTENSIONS_XF86VMODE_H
/* Define if you have the <X11/extensions/Xrender.h> header file. */
/* Define to 1 if you have the <X11/extensions/Xrender.h> header file. */
#undef HAVE_X11_EXTENSIONS_XRENDER_H
/* Define if you have the <X11/extensions/XShm.h> header file. */
/* Define to 1 if you have the <X11/extensions/XShm.h> header file. */
#undef HAVE_X11_EXTENSIONS_XSHM_H
/* Define if you have the <X11/extensions/Xvlib.h> header file. */
/* Define to 1 if you have the <X11/extensions/Xvlib.h> header file. */
#undef HAVE_X11_EXTENSIONS_XVLIB_H
/* Define if you have the <X11/XKBlib.h> header file. */
/* Define to 1 if you have the <X11/XKBlib.h> header file. */
#undef HAVE_X11_XKBLIB_H
/* Define if you have the <X11/Xlib.h> header file. */
/* Define to 1 if you have the <X11/Xlib.h> header file. */
#undef HAVE_X11_XLIB_H
/* Define if you have the XKB extension */
......@@ -547,22 +548,22 @@
/* Define if the X libraries support XVideo */
#undef HAVE_XVIDEO
/* Define if you have the `_lwp_create' function. */
/* Define to 1 if you have the `_lwp_create' function. */
#undef HAVE__LWP_CREATE
/* Define if you have the `_pclose' function. */
/* Define to 1 if you have the `_pclose' function. */
#undef HAVE__PCLOSE
/* Define if you have the `_popen' function. */
/* Define to 1 if you have the `_popen' function. */
#undef HAVE__POPEN
/* Define if you have the `_stricmp' function. */
/* Define to 1 if you have the `_stricmp' function. */
#undef HAVE__STRICMP
/* Define if you have the `_strnicmp' function. */
/* Define to 1 if you have the `_strnicmp' function. */
#undef HAVE__STRNICMP
/* Define if you have the `__libc_fork' function. */
/* Define to 1 if you have the `__libc_fork' function. */
#undef HAVE___LIBC_FORK
/* Define if stdcall symbols need to be decorated */
......@@ -583,6 +584,21 @@
/* Define to disable trace messages. */
#undef NO_TRACE_MSGS
/* Define to the address where bug reports for this package should be sent. */
#undef PACKAGE_BUGREPORT
/* Define to the full name of this package. */
#undef PACKAGE_NAME
/* Define to the full name and version of this package. */
#undef PACKAGE_STRING
/* Define to the one symbol short name of this package. */
#undef PACKAGE_TARNAME
/* Define to the version of this package. */
#undef PACKAGE_VERSION
/* The size of a `long long', as computed by sizeof. */
#undef SIZEOF_LONG_LONG
......@@ -609,17 +625,17 @@
/* Define if the struct statfs has the member bfree */
#undef STATFS_HAS_BFREE
/* Define if the `S_IS*' macros in <sys/stat.h> do not work properly. */
/* Define to 1 if the `S_IS*' macros in <sys/stat.h> do not work properly. */
#undef STAT_MACROS_BROKEN
/* Define if you have the ANSI C header files. */
/* Define to 1 if you have the ANSI C header files. */
#undef STDC_HEADERS
/* Define if the X Window System is missing or not being used. */
/* Define to 1 if the X Window System is missing or not being used. */
#undef X_DISPLAY_MISSING
/* Define if `lex' declares `yytext' as a `char *' by default, not a `char[]'.
*/
/* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a
`char[]'. */
#undef YYTEXT_POINTER
/* Set this to 64 to enable 64-bit file support on Linux */
......
misc/options.c
View file @ daa2886c
......@@ -26,7 +26,6 @@
#include "winnls.h"
#include "ntddk.h"
#include "wine/library.h"
#include "wine/version.h"
#include "options.h"
#include "module.h"
#include "wine/debug.h"
......@@ -92,7 +91,7 @@ static void do_help( const char *arg )
static void do_version( const char *arg )
{
MESSAGE( "%s\n", WINE_RELEASE_INFO );
MESSAGE( "%s\n", PACKAGE_STRING );
ExitProcess(0);
}
......@@ -313,7 +312,7 @@ static void inherit_options( char *buffer )
void OPTIONS_Usage(void)
{
const struct option_descr *opt;
MESSAGE( "%s\n\n", WINE_RELEASE_INFO );
MESSAGE( "%s\n\n", PACKAGE_STRING );
MESSAGE( "Usage: %s [options] [--] program_name [arguments]\n", argv0 );
MESSAGE("The -- has to be used if you specify arguments (of the program)\n\n");
MESSAGE( "Options:\n" );
......
programs/clock/main.c
View file @ daa2886c
......@@ -23,11 +23,12 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "config.h"
#include <stdio.h>
#include "windows.h"
#include "main.h"
#include "license.h"
#include "wine/version.h"
#include "language.h"
#include "winclock.h"
#include "commdlg.h"
......@@ -106,7 +107,7 @@ CHAR szAppRelease[MAX_STRING_LEN];
case 0x10B: {
LoadString(Globals.hInstance, 0x10C, szApp, sizeof(szApp));
lstrcpy(szAppRelease,szApp);
lstrcat(szAppRelease,"\n" WINE_RELEASE_INFO);
lstrcat(szAppRelease,"\n" PACKAGE_STRING);
ShellAbout(Globals.hMainWnd, szApp, szAppRelease, 0);
break;
}
......
programs/winver/winver.c
View file @ daa2886c
......@@ -18,12 +18,12 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "config.h"
#include "windows.h"
#include "wine/version.h"
int PASCAL WinMain (HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
{
return ShellAbout((HWND)0, "WINE", WINE_RELEASE_INFO, 0);
return ShellAbout((HWND)0, PACKAGE_NAME, PACKAGE_STRING, 0);
}
/* Local Variables: */
......
windows/nonclient.c
View file @ daa2886c
......@@ -18,10 +18,11 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "config.h"
#include "windef.h"
#include "wingdi.h"
#include "wine/winuser16.h"
#include "wine/version.h"
#include "win.h"
#include "user.h"
#include "dce.h"
......@@ -2178,7 +2179,7 @@ LONG NC_HandleSysCommand( HWND hwnd, WPARAM wParam, LPARAM lParam )
if (hmodule)
{
FARPROC aboutproc = GetProcAddress( hmodule, "ShellAboutA" );
if (aboutproc) aboutproc( hwnd, "Wine", WINE_RELEASE_INFO, 0 );
if (aboutproc) aboutproc( hwnd, PACKAGE_NAME, PACKAGE_STRING, 0 );
FreeLibrary( hmodule );
}
}
......
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