[pkg-wine-party] [SCM] Debian Wine packaging branch, deb/execstack, updated. wine-1.0-rc1-4-g00684d4
Ove Kaaven
ovek at arcticnet.no
Sat May 10 07:57:08 UTC 2008
The following commit has been merged in the deb/execstack branch:
commit 00684d446b590459cf8785ae5ead77e054e5624e
Merge: b214ff640f9e762e8baf26ebae59928cf902f339 ef304bbecf7f8f2cc51d69266009816a25f05e90
Author: Ove Kaaven <ovek at arcticnet.no>
Date: Sat May 10 09:44:32 2008 +0200
Merge branch 'upstream' into deb/execstack
Conflicts:
configure
diff --combined configure
index 8be02b6,4bad30e..eb5e826
--- a/configure
+++ b/configure
@@@ -1,6 -1,6 +1,6 @@@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
- # Generated by GNU Autoconf 2.61 for Wine 0.9.41.
+ # Generated by GNU Autoconf 2.61 for Wine 1.0-rc1.
#
# Report bugs to <wine-devel at winehq.org>.
#
@@@ -574,8 -574,8 +574,8 @@@ SHELL=${CONFIG_SHELL-/bin/sh
# Identity of this package.
PACKAGE_NAME='Wine'
PACKAGE_TARNAME='wine'
- PACKAGE_VERSION='0.9.41'
- PACKAGE_STRING='Wine 0.9.41'
+ PACKAGE_VERSION='1.0-rc1'
+ PACKAGE_STRING='Wine 1.0-rc1'
PACKAGE_BUGREPORT='wine-devel at winehq.org'
ac_unique_file="server/atom.c"
@@@ -652,6 -652,7 +652,7 @@@ LIB
build_alias
host_alias
target_alias
+ MAINTAINER_MODE
build
build_cpu
build_vendor
@@@ -687,6 -688,7 +688,7 @@@ A
ac_ct_AS
LD
AR
+ ARFLAGS
RANLIB
STRIP
WINDRES
@@@ -702,6 -704,8 +704,8 @@@ LIN
LINTFLAGS
FONTFORGE
PKG_CONFIG
+ RSVG
+ ICOTOOL
PRELINK
LIBPTHREAD
XLIB
@@@ -722,6 -726,7 +726,7 @@@ LD
DLLTOOL
DLLWRAP
MINGWAR
+ SECURITYLIB
COREFOUNDATIONLIB
IOKITLIB
LDEXECFLAGS
@@@ -743,7 -748,6 +748,6 @@@ gphoto2_deve
gphoto2port_devel
GPHOTO2LIBS
GPHOTO2INCL
- ICULIBS
RESOLVLIBS
LCMSLIBS
LDAPLIBS
@@@ -756,9 -760,9 +760,10 @@@ ESDLIB
ESDINCL
ALSALIBS
AUDIOIOLIBS
+ FONTCONFIGINCL
EXTRACFLAGS
BUILTINFLAG
+EXECSTACK
LDPATH
CRTLIBS
SOCKETLIBS
@@@ -1289,7 -1293,7 +1294,7 @@@ if test "$ac_init_help" = "long"; the
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
- \`configure' configures Wine 0.9.41 to adapt to many kinds of systems.
+ \`configure' configures Wine 1.0-rc1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@@ -1358,7 -1362,7 +1363,7 @@@ f
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of Wine 0.9.41:";;
+ short | recursive ) echo "Configuration of Wine 1.0-rc1:";;
esac
cat <<\_ACEOF
@@@ -1368,12 -1372,45 +1373,45 @@@ Optional Features
--disable-win16 do not include Win16 support
--enable-win64 build a Win64 emulator on AMD64 (won't run Win32
binaries)
+ --enable-maintainer-mode
+ enable maintainer-specific build rules
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
+ --without-alsa do not use the Alsa sound support
+ --without-audioio do not use the AudioIO sound support
+ --without-capi do not use CAPI (ISDN support)
+ --without-cms do not use CMS (color management support)
+ --without-coreaudio do not use the CoreAudio sound support
+ --without-cups do not use CUPS
+ --without-curses do not use (n)curses
+ --without-esd do not use the EsounD sound support
+ --without-fontconfig do not use fontconfig
+ --without-gphoto do not use gphoto (Digital Camera support)
+ --without-glu do not use the GLU library
+ --without-hal do not use HAL (dynamic device support)
+ --without-jack do not use the Jack sound support
+ --without-jpeg do not use JPEG
+ --without-ldap do not use LDAP
+ --without-nas do not use the NAS sound support
--without-opengl do not use OpenGL
- --with-wine-tools=<dir> use Wine tools from directory <dir>
+ --without-openssl do not use OpenSSL
+ --without-oss do not use the OSS sound support
+ --without-png do not use PNG
+ --without-sane do not use SANE (scanner support)
+ --without-xcomposite do not use the Xcomposite extension
+ --without-xcursor do not use the Xcursor extension
+ --without-xinerama do not use Xinerama (multi-monitor support)
+ --without-xinput do not use the Xinput extension
+ --without-xml do not use XML
+ --without-xrandr do not use Xrandr (resolution changes)
+ --without-xrender do not use the Xrender extension
+ --without-xshape do not use the Xshape extension
+ --without-xshm do not use XShm (shared memory extension)
+ --without-xslt do not use XSLT
+ --without-xvidmode do not use XFree video mode extension
+ --with-wine-tools=DIR use Wine tools from directory DIR
--with-x use the X Window System
Some influential environment variables:
@@@ -1453,7 -1490,7 +1491,7 @@@ f
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
- Wine configure 0.9.41
+ Wine configure 1.0-rc1
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@@ -1467,7 -1504,7 +1505,7 @@@ cat >config.log <<_ACEO
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 0.9.41, which was
+ It was created by Wine $as_me 1.0-rc1, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@@ -1866,6 -1903,110 +1904,110 @@@ if test "${enable_win64+set}" = set; th
enableval=$enable_win64;
fi
+ # Check whether --enable-maintainer-mode was given.
+ if test "${enable_maintainer_mode+set}" = set; then
+ enableval=$enable_maintainer_mode;
+ else
+ MAINTAINER_MODE=\#
+
+ fi
+
+
+
+ # Check whether --with-alsa was given.
+ if test "${with_alsa+set}" = set; then
+ withval=$with_alsa; if test "x$withval" = "xno"; then ac_cv_header_sys_asoundlib_h=no; ac_cv_header_alsa_asoundlib_h=no; fi
+ fi
+
+
+ # Check whether --with-audioio was given.
+ if test "${with_audioio+set}" = set; then
+ withval=$with_audioio; if test "x$withval" = "xno"; then ac_cv_header_libaudioio_h=no; fi
+ fi
+
+
+ # Check whether --with-capi was given.
+ if test "${with_capi+set}" = set; then
+ withval=$with_capi; if test "x$withval" = "xno"; then ac_cv_header_capi20_h=no; ac_cv_header_linux_capi_h=no; fi
+ fi
+
+
+ # Check whether --with-cms was given.
+ if test "${with_cms+set}" = set; then
+ withval=$with_cms; if test "x$withval" = "xno"; then ac_cv_header_lcms_h=no; ac_cv_header_lcms_lcms_h=no; fi
+ fi
+
+
+ # Check whether --with-coreaudio was given.
+ if test "${with_coreaudio+set}" = set; then
+ withval=$with_coreaudio; if test "x$withval" = "xno"; then ac_cv_header_CoreAudio_CoreAudio_h=no; fi
+ fi
+
+
+ # Check whether --with-cups was given.
+ if test "${with_cups+set}" = set; then
+ withval=$with_cups; if test "x$withval" = "xno"; then ac_cv_header_cups_cups_h=no; fi
+ fi
+
+
+ # Check whether --with-curses was given.
+ if test "${with_curses+set}" = set; then
+ withval=$with_curses; if test "x$withval" = "xno"; then ac_cv_header_ncurses_h=no; ac_cv_header_curses_h=no; fi
+ fi
+
+
+ # Check whether --with-esd was given.
+ if test "${with_esd+set}" = set; then
+ withval=$with_esd;
+ fi
+
+
+ # Check whether --with-fontconfig was given.
+ if test "${with_fontconfig+set}" = set; then
+ withval=$with_fontconfig; if test "x$withval" = "xno"; then ac_cv_header_fontconfig_fontconfig_h=no; fi
+ fi
+
+
+ # Check whether --with-gphoto was given.
+ if test "${with_gphoto+set}" = set; then
+ withval=$with_gphoto;
+ fi
+
+
+ # Check whether --with-glu was given.
+ if test "${with_glu+set}" = set; then
+ withval=$with_glu; if test "x$withval" = "xno"; then ac_cv_header_GL_glu_h=no; fi
+ fi
+
+
+ # Check whether --with-hal was given.
+ if test "${with_hal+set}" = set; then
+ withval=$with_hal;
+ fi
+
+
+ # Check whether --with-jack was given.
+ if test "${with_jack+set}" = set; then
+ withval=$with_jack; if test "x$withval" = "xno"; then ac_cv_header_jack_jack_h=no; fi
+ fi
+
+
+ # Check whether --with-jpeg was given.
+ if test "${with_jpeg+set}" = set; then
+ withval=$with_jpeg; if test "x$withval" = "xno"; then ac_cv_header_jpeglib_h=no; fi
+ fi
+
+
+ # Check whether --with-ldap was given.
+ if test "${with_ldap+set}" = set; then
+ withval=$with_ldap; if test "x$withval" = "xno"; then ac_cv_header_ldap_h=no; ac_cv_header_lber_h=no; fi
+ fi
+
+
+ # Check whether --with-nas was given.
+ if test "${with_nas+set}" = set; then
+ withval=$with_nas; if test "x$withval" = "xno"; then ac_cv_header_audio_audiolib_h=no; fi
+ fi
# Check whether --with-opengl was given.
@@@ -1874,6 -2015,97 +2016,97 @@@ if test "${with_opengl+set}" = set; the
fi
+ # Check whether --with-openssl was given.
+ if test "${with_openssl+set}" = set; then
+ withval=$with_openssl; if test "x$withval" = "xno"; then ac_cv_header_openssl_err_h=no; ac_cv_header_openssl_ssl_h=no; fi
+ fi
+
+
+ # Check whether --with-oss was given.
+ if test "${with_oss+set}" = set; then
+ withval=$with_oss; if test "x$withval" = "xno"; then ac_cv_header_soundcard_h=no; ac_cv_header_sys_soundcard_h=no; ac_cv_header_machine_soundcard_h=no; fi
+ fi
+
+
+ # Check whether --with-png was given.
+ if test "${with_png+set}" = set; then
+ withval=$with_png; if test "x$withval" = "xno"; then ac_cv_header_png_h=no; fi
+ fi
+
+
+ # Check whether --with-sane was given.
+ if test "${with_sane+set}" = set; then
+ withval=$with_sane;
+ fi
+
+
+ # Check whether --with-xcomposite was given.
+ if test "${with_xcomposite+set}" = set; then
+ withval=$with_xcomposite; if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_Xcomposite_h=no; fi
+ fi
+
+
+ # Check whether --with-xcursor was given.
+ if test "${with_xcursor+set}" = set; then
+ withval=$with_xcursor; if test "x$withval" = "xno"; then ac_cv_header_X11_Xcursor_Xcursor_h=no; fi
+ fi
+
+
+ # Check whether --with-xinerama was given.
+ if test "${with_xinerama+set}" = set; then
+ withval=$with_xinerama; if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_Xinerama_h=no; fi
+ fi
+
+
+ # Check whether --with-xinput was given.
+ if test "${with_xinput+set}" = set; then
+ withval=$with_xinput; if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_XInput_h=no; fi
+ fi
+
+
+ # Check whether --with-xml was given.
+ if test "${with_xml+set}" = set; then
+ withval=$with_xml;
+ fi
+
+
+ # Check whether --with-xrandr was given.
+ if test "${with_xrandr+set}" = set; then
+ withval=$with_xrandr; if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_Xrandr_h=no; fi
+ fi
+
+
+ # Check whether --with-xrender was given.
+ if test "${with_xrender+set}" = set; then
+ withval=$with_xrender; if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_Xrender_h=no; fi
+ fi
+
+
+ # Check whether --with-xshape was given.
+ if test "${with_xshape+set}" = set; then
+ withval=$with_xshape; if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_shape_h=no; fi
+ fi
+
+
+ # Check whether --with-xshm was given.
+ if test "${with_xshm+set}" = set; then
+ withval=$with_xshm; if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_XShm_h=no; fi
+ fi
+
+
+ # Check whether --with-xslt was given.
+ if test "${with_xslt+set}" = set; then
+ withval=$with_xslt;
+ fi
+
+
+ # Check whether --with-xvidmode was given.
+ if test "${with_xvidmode+set}" = set; then
+ withval=$with_xvidmode; if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_xf86vmode_h=no; fi
+ fi
+
+
+
# Check whether --with-wine-tools was given.
if test "${with_wine_tools+set}" = set; then
withval=$with_wine_tools;
@@@ -1968,6 -2200,7 +2201,7 @@@ case $host i
if test "x$enable_win64" != "xyes"
then
test -n "$CC" || CC="gcc -m32"
+ test -n "$CXX"|| CXX="g++ -m32"
test -n "$LD" || LD="ld -m elf_i386"
test -n "$AS" || AS="as --32"
host_cpu="i386"
@@@ -5388,6 -5621,8 +5622,8 @@@ els
AR="$ac_cv_prog_AR"
fi
+ ARFLAGS=rc
+
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
set dummy ${ac_tool_prefix}ranlib; ac_word=$2
@@@ -6126,6 -6361,99 +6362,99 @@@ f
done
test -n "$PKG_CONFIG" || PKG_CONFIG="false"
+ for ac_prog in rsvg
+ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+ { echo "$as_me:$LINENO: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_RSVG+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ if test -n "$RSVG"; then
+ ac_cv_prog_RSVG="$RSVG" # Let the user override the test.
+ else
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ for as_dir in $PATH
+ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_RSVG="$ac_prog"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+ done
+ IFS=$as_save_IFS
+
+ fi
+ fi
+ RSVG=$ac_cv_prog_RSVG
+ if test -n "$RSVG"; then
+ { echo "$as_me:$LINENO: result: $RSVG" >&5
+ echo "${ECHO_T}$RSVG" >&6; }
+ else
+ { echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6; }
+ fi
+
+
+ test -n "$RSVG" && break
+ done
+ test -n "$RSVG" || RSVG="false"
+
+ for ac_prog in icotool
+ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+ { echo "$as_me:$LINENO: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_ICOTOOL+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ if test -n "$ICOTOOL"; then
+ ac_cv_prog_ICOTOOL="$ICOTOOL" # Let the user override the test.
+ else
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ for as_dir in $PATH
+ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ICOTOOL="$ac_prog"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+ done
+ IFS=$as_save_IFS
+
+ fi
+ fi
+ ICOTOOL=$ac_cv_prog_ICOTOOL
+ if test -n "$ICOTOOL"; then
+ { echo "$as_me:$LINENO: result: $ICOTOOL" >&5
+ echo "${ECHO_T}$ICOTOOL" >&6; }
+ else
+ { echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6; }
+ fi
+
+
+ test -n "$ICOTOOL" && break
+ done
+ test -n "$ICOTOOL" || ICOTOOL="false"
+
+
+ if test "${enable_maintainer_mode+set}" = set
+ then
+ if test "$FONTFORGE" = "false"; then wine_warnings="$wine_warnings|fontforge is missing, fonts can't be rebuilt."; fi
+ if test "$RSVG" = "false"; then wine_warnings="$wine_warnings|rsvg is missing, icons can't be rebuilt."; fi
+ if test "$ICOTOOL" = "false"; then wine_warnings="$wine_warnings|icotool is missing, icons can't be rebuilt."; fi
+ fi
case $host_cpu in
*i[3456789]86*)
@@@ -6316,77 -6644,6 +6645,6 @@@ _ACEO
fi
-
- { echo "$as_me:$LINENO: checking for _xpg4_setrunelocale in -lxpg4" >&5
- echo $ECHO_N "checking for _xpg4_setrunelocale in -lxpg4... $ECHO_C" >&6; }
- if test "${ac_cv_lib_xpg4__xpg4_setrunelocale+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lxpg4 $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
- /* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
- #endif
- char _xpg4_setrunelocale ();
- int
- main ()
- {
- return _xpg4_setrunelocale ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (ac_try="$ac_link"
- case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
- ac_cv_lib_xpg4__xpg4_setrunelocale=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_xpg4__xpg4_setrunelocale=no
- fi
-
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
- { echo "$as_me:$LINENO: result: $ac_cv_lib_xpg4__xpg4_setrunelocale" >&5
- echo "${ECHO_T}$ac_cv_lib_xpg4__xpg4_setrunelocale" >&6; }
- if test $ac_cv_lib_xpg4__xpg4_setrunelocale = yes; then
- cat >>confdefs.h <<_ACEOF
- #define HAVE_LIBXPG4 1
- _ACEOF
-
- LIBS="-lxpg4 $LIBS"
-
- fi
-
{ echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6; }
if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
@@@ -6821,7 -7078,6 +7079,6 @@@ don
-
for ac_header in \
AudioUnit/AudioUnit.h \
Carbon/Carbon.h \
@@@ -6930,7 -7186,6 +7187,6 @@@
sys/wait.h \
syscall.h \
termios.h \
- unicode/ubidi.h \
unistd.h \
utime.h \
valgrind/memcheck.h
@@@ -7167,7 -7422,7 +7423,7 @@@ cat confdefs.h >>conftest.$ac_ex
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <sys/types.h>
- #if HAVE_SYS_PARAM_H
+ #ifdef HAVE_SYS_PARAM_H
# include <sys/param.h>
#endif
@@@ -7236,9 -7491,15 +7492,15 @@@ cat confdefs.h >>conftest.$ac_ex
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <sys/types.h>
- #if HAVE_SYS_SOCKET_H
+ #ifdef HAVE_SYS_SOCKET_H
# include <sys/socket.h>
#endif
+ #ifdef HAVE_SYS_SOCKETVAR_H
+ # include <sys/socketvar.h>
+ #endif
+ #ifdef HAVE_NETINET_IN_H
+ # include <netinet/in.h>
+ #endif
#include <$ac_header>
_ACEOF
@@@ -7281,9 -7542,6 +7543,6 @@@ f
done
- #if HAVE_SYS_SOCKETVAR_H
- # include <sys/socketvar.h>
- #endif
for ac_header in netinet/tcp_var.h
@@@ -7301,13 -7559,13 +7560,13 @@@ cat confdefs.h >>conftest.$ac_ex
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <sys/types.h>
- #if HAVE_SYS_SOCKET_H
+ #ifdef HAVE_SYS_SOCKET_H
# include <sys/socket.h>
#endif
- #if HAVE_SYS_SOCKETVAR_H
+ #ifdef HAVE_SYS_SOCKETVAR_H
# include <sys/socketvar.h>
#endif
- #if HAVE_NETINET_IN_H
+ #ifdef HAVE_NETINET_IN_H
# include <netinet/in.h>
#endif
#ifdef HAVE_NETINET_TCP_H
@@@ -7375,7 -7633,7 +7634,7 @@@ cat >>conftest.$ac_ext <<_ACEO
#ifdef HAVE_ASM_TYPES_H
# include <asm/types.h>
#endif
- #if HAVE_SYS_SOCKET_H
+ #ifdef HAVE_SYS_SOCKET_H
# include <sys/socket.h>
#endif
@@@ -7437,13 -7695,13 +7696,13 @@@ cat confdefs.h >>conftest.$ac_ex
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <sys/types.h>
- #if HAVE_SYS_SOCKET_H
+ #ifdef HAVE_SYS_SOCKET_H
# include <sys/socket.h>
#endif
- #if HAVE_NETINET_IN_H
+ #ifdef HAVE_NETINET_IN_H
# include <netinet/in.h>
#endif
- #if HAVE_ARPA_NAMESER_H
+ #ifdef HAVE_ARPA_NAMESER_H
# include <arpa/nameser.h>
#endif
@@@ -7549,6 -7807,68 +7808,68 @@@ don
+ for ac_header in sys/thr.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ { echo "$as_me:$LINENO: checking for $ac_header" >&5
+ echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ #include <sys/types.h>
+ #ifdef HAVE_UCONTEXT_H
+ #include <ucontext.h>
+ #endif
+
+ #include <$ac_header>
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (ac_try="$ac_compile"
+ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ eval "$as_ac_Header=yes"
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ eval "$as_ac_Header=no"
+ fi
+
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+ ac_res=`eval echo '${'$as_ac_Header'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+ echo "${ECHO_T}$ac_res" >&6; }
+ if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+ #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+
+ fi
+
+ done
+
+
+
for ac_header in pthread_np.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@@ -8101,7 -8421,9 +8422,9 @@@ f
LDSHARED="\$(CC) -dynamiclib"
STRIP="$STRIP -x"
LDRPATH_LOCAL="&& install_name_tool -change @executable_path/\`\$(RELPATH) \$(bindir) \$(libdir)\`/libwine.1.dylib @executable_path/\$(TOPOBJDIR)/libs/wine/libwine.1.dylib \$@ || \$(RM) \$@"
- COREFOUNDATIONLIB="-framework CoreFoundation"
+ SECURITYLIB="-framework Security -framework CoreFoundation"
+
+ COREFOUNDATIONLIB="-framework CoreFoundation"
IOKITLIB="-framework IOKit -framework CoreFoundation"
@@@ -8658,6 -8980,65 +8981,65 @@@ f
fi
+ { echo "$as_me:$LINENO: checking whether the compiler supports -Wl,--enable-new-dtags" >&5
+ echo $ECHO_N "checking whether the compiler supports -Wl,--enable-new-dtags... $ECHO_C" >&6; }
+ if test "${ac_cv_cflags__Wl___enable_new_dtags+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_wine_try_cflags_saved=$CFLAGS
+ CFLAGS="$CFLAGS -Wl,--enable-new-dtags"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+
+ int
+ main ()
+ {
+
+ ;
+ return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (ac_try="$ac_link"
+ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+ ac_cv_cflags__Wl___enable_new_dtags=yes
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_cflags__Wl___enable_new_dtags=no
+ fi
+
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS=$ac_wine_try_cflags_saved
+ fi
+ { echo "$as_me:$LINENO: result: $ac_cv_cflags__Wl___enable_new_dtags" >&5
+ echo "${ECHO_T}$ac_cv_cflags__Wl___enable_new_dtags" >&6; }
+ if test $ac_cv_cflags__Wl___enable_new_dtags = yes; then
+ LDRPATH_INSTALL="$LDRPATH_INSTALL -Wl,--enable-new-dtags"
+ fi
+
+
case $host_cpu in
*i[3456789]86* | x86_64)
{ echo "$as_me:$LINENO: checking whether the compiler supports -Wl,--section-start,.interp=0x7bf00400" >&5
@@@ -8826,7 -9207,7 +9208,7 @@@ echo "${ECHO_T}$ac_cv_c_dll_hpux" >&6;
if test "$cross_compiling" = "no"
then
- for ac_prog in i586-mingw32msvc-gcc i386-mingw32msvc-gcc i386-mingw32-gcc mingw32-gcc mingw-gcc
+ for ac_prog in i586-mingw32msvc-gcc i386-mingw32msvc-gcc i686-mingw32-gcc i586-mingw32-gcc i386-mingw32-gcc mingw32-gcc mingw-gcc
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@@ -8869,7 -9250,7 +9251,7 @@@ f
done
test -n "$CROSSCC" || CROSSCC="false"
- for ac_prog in i586-mingw32msvc-dlltool i386-mingw32msvc-dlltool i386-mingw32-dlltool mingw32-dlltool mingw-dlltool
+ for ac_prog in i586-mingw32msvc-dlltool i386-mingw32msvc-dlltool i686-mingw32-dlltool i586-mingw32-dlltool i386-mingw32-dlltool mingw32-dlltool mingw-dlltool
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@@ -8912,7 -9293,7 +9294,7 @@@ f
done
test -n "$DLLTOOL" || DLLTOOL="false"
- for ac_prog in i586-mingw32msvc-windres i386-mingw32msvc-windres i386-mingw32-windres mingw32-windres mingw-windres
+ for ac_prog in i586-mingw32msvc-windres i386-mingw32msvc-windres i686-mingw32-windres i586-mingw32-windres i386-mingw32-windres mingw32-windres mingw-windres
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@@ -8955,7 -9336,7 +9337,7 @@@ f
done
test -n "$CROSSWINDRES" || CROSSWINDRES="false"
- for ac_prog in i586-mingw32msvc-ar i386-mingw32msvc-ar i386-mingw32-ar mingw32-ar mingw-ar
+ for ac_prog in i586-mingw32msvc-ar i386-mingw32msvc-ar i686-mingw32-ar i586-mingw32-ar i386-mingw32-ar mingw32-ar mingw-ar
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@@ -9192,6 -9573,7 +9574,7 @@@ f
+
for ac_header in X11/Xlib.h \
X11/XKBlib.h \
X11/Xutil.h \
@@@ -9199,6 -9581,7 +9582,7 @@@
X11/extensions/shape.h \
X11/extensions/XInput.h \
X11/extensions/XShm.h \
+ X11/extensions/Xcomposite.h \
X11/extensions/Xinerama.h \
X11/extensions/Xrandr.h \
X11/extensions/Xrender.h \
@@@ -9419,6 -9802,18 +9803,18 @@@ _ACEO
fi
fi
+ if test "x$ac_cv_lib_soname_Xcursor" = "x"; then
+ case "x$with_xcursor" in
+ x) wine_notices="$wine_notices|libxcursor development files not found, the Xcursor extension won't be supported." ;;
+ xno) ;;
+ *) { { echo "$as_me:$LINENO: error: libxcursor development files not found, the Xcursor extension won't be supported.
+ This is an error since --with-xcursor was requested." >&5
+ echo "$as_me: error: libxcursor development files not found, the Xcursor extension won't be supported.
+ This is an error since --with-xcursor was requested." >&2;}
+ { (exit 1); exit 1; }; } ;;
+ esac
+ fi
+
if test "$ac_cv_header_X11_extensions_XInput_h" = "yes"
then
@@@ -9501,6 -9896,18 +9897,18 @@@ _ACEO
fi
fi
+ if test "x$ac_cv_lib_soname_Xi" = "x"; then
+ case "x$with_xinput" in
+ x) wine_notices="$wine_notices|libxi development files not found, the Xinput extension won't be supported." ;;
+ xno) ;;
+ *) { { echo "$as_me:$LINENO: error: libxi development files not found, the Xinput extension won't be supported.
+ This is an error since --with-xinput was requested." >&5
+ echo "$as_me: error: libxi development files not found, the Xinput extension won't be supported.
+ This is an error since --with-xinput was requested." >&2;}
+ { (exit 1); exit 1; }; } ;;
+ esac
+ fi
+
if test "$ac_cv_header_X11_extensions_XShm_h" = "yes"
then
@@@ -9575,8 -9982,15 +9983,15 @@@ f
fi
if test "$ac_cv_lib_Xext_XShmQueryExtension" != "yes"; then
- wine_notices="$wine_notices|XShm development files not found.
- Wine will be built without XShm support. (winex11.drv)"
+ case "x$with_xshm" in
+ x) wine_notices="$wine_notices|XShm development files not found, X Shared Memory won't be supported." ;;
+ xno) ;;
+ *) { { echo "$as_me:$LINENO: error: XShm development files not found, X Shared Memory won't be supported.
+ This is an error since --with-xshm was requested." >&5
+ echo "$as_me: error: XShm development files not found, X Shared Memory won't be supported.
+ This is an error since --with-xshm was requested." >&2;}
+ { (exit 1); exit 1; }; } ;;
+ esac
fi
@@@ -9653,8 -10067,15 +10068,15 @@@ f
fi
if test "$ac_cv_lib_Xext_XShapeQueryExtension" != "yes"; then
- wine_notices="$wine_notices|XShape development files not found.
- Wine will be built without XShape support. (winex11.drv)"
+ case "x$with_xshape" in
+ x) wine_notices="$wine_notices|XShape development files not found, XShape won't be supported." ;;
+ xno) ;;
+ *) { { echo "$as_me:$LINENO: error: XShape development files not found, XShape won't be supported.
+ This is an error since --with-xshape was requested." >&5
+ echo "$as_me: error: XShape development files not found, XShape won't be supported.
+ This is an error since --with-xshape was requested." >&2;}
+ { (exit 1); exit 1; }; } ;;
+ esac
fi
@@@ -9733,8 -10154,15 +10155,15 @@@ f
fi
if test "$ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension" != "yes"; then
- wine_notices="$wine_notices|Xxf86vm development files not found.
- Wine will be built without XF86 Vidmode support. (winex11.drv)"
+ case "x$with_xvidmode" in
+ x) wine_notices="$wine_notices|libXxf86vm development files not found, XFree86 Vidmode won't be supported." ;;
+ xno) ;;
+ *) { { echo "$as_me:$LINENO: error: libXxf86vm development files not found, XFree86 Vidmode won't be supported.
+ This is an error since --with-xvidmode was requested." >&5
+ echo "$as_me: error: libXxf86vm development files not found, XFree86 Vidmode won't be supported.
+ This is an error since --with-xvidmode was requested." >&2;}
+ { (exit 1); exit 1; }; } ;;
+ esac
fi
@@@ -9889,8 -10317,15 +10318,15 @@@ f
fi
if test "x$ac_cv_lib_soname_Xrender" = "x"; then
- wine_notices="$wine_notices|XRender development files not found.
- Wine will be built without XRender support. (winex11.drv)"
+ case "x$with_xrender" in
+ x) wine_notices="$wine_notices|libxrender development files not found, XRender won't be supported." ;;
+ xno) ;;
+ *) { { echo "$as_me:$LINENO: error: libxrender development files not found, XRender won't be supported.
+ This is an error since --with-xrender was requested." >&5
+ echo "$as_me: error: libxrender development files not found, XRender won't be supported.
+ This is an error since --with-xrender was requested." >&2;}
+ { (exit 1); exit 1; }; } ;;
+ esac
fi
@@@ -10017,8 -10452,15 +10453,15 @@@ f
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
if test "x$ac_cv_lib_soname_Xrandr" = "x"; then
- wine_notices="$wine_notices|XRandr development files not found.
- Wine will be built without XRandr support. (winex11.drv)"
+ case "x$with_xrandr" in
+ x) wine_notices="$wine_notices|libxrandr development files not found, XRandr won't be supported." ;;
+ xno) ;;
+ *) { { echo "$as_me:$LINENO: error: libxrandr development files not found, XRandr won't be supported.
+ This is an error since --with-xrandr was requested." >&5
+ echo "$as_me: error: libxrandr development files not found, XRandr won't be supported.
+ This is an error since --with-xrandr was requested." >&2;}
+ { (exit 1); exit 1; }; } ;;
+ esac
fi
@@@ -10145,13 -10587,224 +10588,224 @@@ f
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
if test "x$ac_cv_lib_soname_Xinerama" = "x"; then
- wine_notices="$wine_notices|Xinerama development files not found.
- Wine will be built without Xinerama support. (winex11.drv)"
+ case "x$with_xinerama" in
+ x) wine_notices="$wine_notices|libxinerama development files not found, multi-monitor setups won't be supported." ;;
+ xno) ;;
+ *) { { echo "$as_me:$LINENO: error: libxinerama development files not found, multi-monitor setups won't be supported.
+ This is an error since --with-xinerama was requested." >&5
+ echo "$as_me: error: libxinerama development files not found, multi-monitor setups won't be supported.
+ This is an error since --with-xinerama was requested." >&2;}
+ { (exit 1); exit 1; }; } ;;
+ esac
+ fi
+
+
+ if test "$ac_cv_header_X11_extensions_Xcomposite_h" = "yes"
+ then
+ { echo "$as_me:$LINENO: checking for -lXcomposite" >&5
+ echo $ECHO_N "checking for -lXcomposite... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_soname_Xcomposite+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_check_soname_save_LIBS=$LIBS
+ LIBS="-lXcomposite $X_LIBS -lXext -lX11 $X_EXTRA_LIBS $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+
+ /* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+ char XCompositeRedirectWindow ();
+ int
+ main ()
+ {
+ return XCompositeRedirectWindow ();
+ ;
+ return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (ac_try="$ac_link"
+ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+ case "$LIBEXT" in
+ dll) ;;
+ dylib) ac_cv_lib_soname_Xcomposite=`otool -L conftest$ac_exeext | grep "libXcomposite\\.[0-9A-Za-z.]*dylib" | sed -e "s/^.*\/\(libXcomposite\.[0-9A-Za-z.]*dylib\).*$/\1/"';2,$d'` ;;
+ *) ac_cv_lib_soname_Xcomposite=`$ac_cv_path_LDD conftest$ac_exeext | grep "libXcomposite\\.$LIBEXT" | sed -e "s/^.*\(libXcomposite\.$LIBEXT[^ ]*\).*$/\1/"';2,$d'` ;;
+ esac
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+
+ fi
+
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_soname_save_LIBS
+ fi
+ if test "x$ac_cv_lib_soname_Xcomposite" = "x"; then
+ { echo "$as_me:$LINENO: result: not found" >&5
+ echo "${ECHO_T}not found" >&6; }
+
+ else
+ { echo "$as_me:$LINENO: result: $ac_cv_lib_soname_Xcomposite" >&5
+ echo "${ECHO_T}$ac_cv_lib_soname_Xcomposite" >&6; }
+
+ cat >>confdefs.h <<_ACEOF
+ #define SONAME_LIBXCOMPOSITE "$ac_cv_lib_soname_Xcomposite"
+ _ACEOF
+
+
+ fi
+
+ fi
+ if test "x$ac_cv_lib_soname_Xcomposite" = "x"; then
+ case "x$with_xcomposite" in
+ x) wine_notices="$wine_notices|libxcomposite development files not found, Xcomposite won't be supported." ;;
+ xno) ;;
+ *) { { echo "$as_me:$LINENO: error: libxcomposite development files not found, Xcomposite won't be supported.
+ This is an error since --with-xcomposite was requested." >&5
+ echo "$as_me: error: libxcomposite development files not found, Xcomposite won't be supported.
+ This is an error since --with-xcomposite was requested." >&2;}
+ { (exit 1); exit 1; }; } ;;
+ esac
+ fi
+
+
+ { echo "$as_me:$LINENO: checking for XICCallback.callback" >&5
+ echo $ECHO_N "checking for XICCallback.callback... $ECHO_C" >&6; }
+ if test "${ac_cv_member_XICCallback_callback+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ #ifdef HAVE_X11_XLIB_H
+ #include <X11/Xlib.h>
+ #endif
+
+ int
+ main ()
+ {
+ static XICCallback ac_aggr;
+ if (ac_aggr.callback)
+ return 0;
+ ;
+ return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (ac_try="$ac_compile"
+ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_member_XICCallback_callback=yes
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ #ifdef HAVE_X11_XLIB_H
+ #include <X11/Xlib.h>
+ #endif
+
+ int
+ main ()
+ {
+ static XICCallback ac_aggr;
+ if (sizeof ac_aggr.callback)
+ return 0;
+ ;
+ return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (ac_try="$ac_compile"
+ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_member_XICCallback_callback=yes
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_member_XICCallback_callback=no
fi
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+ { echo "$as_me:$LINENO: result: $ac_cv_member_XICCallback_callback" >&5
+ echo "${ECHO_T}$ac_cv_member_XICCallback_callback" >&6; }
+ if test $ac_cv_member_XICCallback_callback = yes; then
+
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_XICCALLBACK_CALLBACK 1
+ _ACEOF
+
+
+ fi
- if test "x$with_opengl" != "xno"
+
+ opengl_msg=""
+ if test "x$with_opengl" != "xno"
then
@@@ -10336,14 -10989,96 +10990,96 @@@ f
if test "x$ac_cv_lib_soname_GL" = "x"; then
{ echo "$as_me:$LINENO: result: not found" >&5
echo "${ECHO_T}not found" >&6; }
+ { echo "$as_me:$LINENO: checking for -lGL" >&5
+ echo $ECHO_N "checking for -lGL... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_soname_GL+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_check_soname_save_LIBS=$LIBS
+ LIBS="-lGL $X_LIBS -lXext -lX11 -lm $X_EXTRA_LIBS -dylib_file /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+
+ /* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+ char glXCreateContext ();
+ int
+ main ()
+ {
+ return glXCreateContext ();
+ ;
+ return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (ac_try="$ac_link"
+ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+ case "$LIBEXT" in
+ dll) ;;
+ dylib) ac_cv_lib_soname_GL=`otool -L conftest$ac_exeext | grep "libGL\\.[0-9A-Za-z.]*dylib" | sed -e "s/^.*\/\(libGL\.[0-9A-Za-z.]*dylib\).*$/\1/"';2,$d'` ;;
+ *) ac_cv_lib_soname_GL=`$ac_cv_path_LDD conftest$ac_exeext | grep "libGL\\.$LIBEXT" | sed -e "s/^.*\(libGL\.$LIBEXT[^ ]*\).*$/\1/"';2,$d'` ;;
+ esac
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+
+ fi
+
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_soname_save_LIBS
+ fi
+ if test "x$ac_cv_lib_soname_GL" = "x"; then
+ { echo "$as_me:$LINENO: result: not found" >&5
+ echo "${ECHO_T}not found" >&6; }
if test -f /usr/X11R6/lib/libGL.a
- then
- wine_warnings="$wine_warnings|/usr/X11R6/lib/libGL.a is present on your system.
+ then
+ opengl_msg="/usr/X11R6/lib/libGL.a is present on your system.
This probably prevents linking to OpenGL. Try deleting the file and restarting configure."
- else
- wine_warnings="$wine_warnings|No OpenGL library found on this system.
- Wine will be build without OpenGL or Direct3D support."
- fi
+ else
+ opengl_msg="No OpenGL library found on this system."
+ fi
+ else
+ { echo "$as_me:$LINENO: result: $ac_cv_lib_soname_GL" >&5
+ echo "${ECHO_T}$ac_cv_lib_soname_GL" >&6; }
+
+ cat >>confdefs.h <<_ACEOF
+ #define SONAME_LIBGL "$ac_cv_lib_soname_GL"
+ _ACEOF
+
+ OPENGL_LIBS="-Xlinker -dylib_file -Xlinker /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib -lGL"
+ OPENGLFILES='$(OPENGLFILES)'
+
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_OPENGL 1
+ _ACEOF
+
+ fi
+
else
{ echo "$as_me:$LINENO: result: $ac_cv_lib_soname_GL" >&5
echo "${ECHO_T}$ac_cv_lib_soname_GL" >&6; }
@@@ -10361,15 -11096,16 +11097,16 @@@ _ACEO
fi
-
- { echo "$as_me:$LINENO: checking for gluLookAt in -lGLU" >&5
- echo $ECHO_N "checking for gluLookAt in -lGLU... $ECHO_C" >&6; }
- if test "${ac_cv_lib_GLU_gluLookAt+set}" = set; then
+ if test "$ac_cv_header_GL_glu_h" = "yes"
+ then
+ { echo "$as_me:$LINENO: checking for -lGLU" >&5
+ echo $ECHO_N "checking for -lGLU... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_soname_GLU+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- ac_check_lib_save_LIBS=$LIBS
+ ac_check_soname_save_LIBS=$LIBS
LIBS="-lGLU $OPENGL_LIBS $X_LIBS $X_PRE_LIBS -lXext -lX11 -lm $X_EXTRA_LIBS $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
+ cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@@ -10409,35 -11145,72 +11146,72 @@@ eval "echo \"\$as_me:$LINENO: $ac_try_e
test ! -s conftest.err
} && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then
- ac_cv_lib_GLU_gluLookAt=yes
+ case "$LIBEXT" in
+ dll) ;;
+ dylib) ac_cv_lib_soname_GLU=`otool -L conftest$ac_exeext | grep "libGLU\\.[0-9A-Za-z.]*dylib" | sed -e "s/^.*\/\(libGLU\.[0-9A-Za-z.]*dylib\).*$/\1/"';2,$d'` ;;
+ *) ac_cv_lib_soname_GLU=`$ac_cv_path_LDD conftest$ac_exeext | grep "libGLU\\.$LIBEXT" | sed -e "s/^.*\(libGLU\.$LIBEXT[^ ]*\).*$/\1/"';2,$d'` ;;
+ esac
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- ac_cv_lib_GLU_gluLookAt=no
+
fi
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
+ LIBS=$ac_check_soname_save_LIBS
+ fi
+ if test "x$ac_cv_lib_soname_GLU" = "x"; then
+ { echo "$as_me:$LINENO: result: not found" >&5
+ echo "${ECHO_T}not found" >&6; }
+
+ else
+ { echo "$as_me:$LINENO: result: $ac_cv_lib_soname_GLU" >&5
+ echo "${ECHO_T}$ac_cv_lib_soname_GLU" >&6; }
+
+ cat >>confdefs.h <<_ACEOF
+ #define SONAME_LIBGLU "$ac_cv_lib_soname_GLU"
+ _ACEOF
+
+ GLU32FILES='$(GLU32FILES)'
fi
- { echo "$as_me:$LINENO: result: $ac_cv_lib_GLU_gluLookAt" >&5
- echo "${ECHO_T}$ac_cv_lib_GLU_gluLookAt" >&6; }
- if test $ac_cv_lib_GLU_gluLookAt = yes; then
- OPENGL_LIBS="$OPENGL_LIBS -lGLU"
- GLU32FILES='$(GLU32FILES)'
+ fi
+ if test "x$ac_cv_lib_soname_GLU" = "x"; then
+ case "x$with_glu" in
+ x) wine_notices="$wine_notices|libGLU development files not found, GLU won't be supported." ;;
+ xno) ;;
+ *) { { echo "$as_me:$LINENO: error: libGLU development files not found, GLU won't be supported.
+ This is an error since --with-glu was requested." >&5
+ echo "$as_me: error: libGLU development files not found, GLU won't be supported.
+ This is an error since --with-glu was requested." >&2;}
+ { (exit 1); exit 1; }; } ;;
+ esac
fi
else
- wine_warnings="$wine_warnings|Old Mesa headers detected. Consider upgrading your Mesa libraries (http://www.mesa3d.org/).
- Wine will be build without OpenGL or Direct3D support."
+ opengl_msg="Old Mesa headers detected. Consider upgrading your Mesa libraries."
fi
else
- wine_warnings="$wine_warnings|OpenGL development headers not found.
- Wine will be build without OpenGL or Direct3D support."
+ opengl_msg="OpenGL development headers not found."
fi
fi
+ if test -n "$opengl_msg"; then
+ case "x$with_opengl" in
+ x) wine_warnings="$wine_warnings|$opengl_msg
+ OpenGL and Direct3D won't be supported." ;;
+ xno) ;;
+ *) { { echo "$as_me:$LINENO: error: $opengl_msg
+ OpenGL and Direct3D won't be supported.
+ This is an error since --with-opengl was requested." >&5
+ echo "$as_me: error: $opengl_msg
+ OpenGL and Direct3D won't be supported.
+ This is an error since --with-opengl was requested." >&2;}
+ { (exit 1); exit 1; }; } ;;
+ esac
+ fi
+
NASLIBS=""
@@@ -10787,12 -11560,27 +11561,27 @@@ els
XLIB=""
X_CFLAGS=""
X_LIBS=""
- wine_warnings="$wine_warnings|X development files not found. Wine will be built
+ fi
+ if test "x$XLIB" = "x"; then
+ case "x$with_x" in
+ x) wine_warnings="$wine_warnings|X development files not found. Wine will be built
+ without X support, which probably isn't what you want. You will need to install
+ development packages of Xlib/Xfree86 at the very least." ;;
+ xno) ;;
+ *) { { echo "$as_me:$LINENO: error: X development files not found. Wine will be built
without X support, which probably isn't what you want. You will need to install
- development packages of Xlib/Xfree86 at the very least."
+ development packages of Xlib/Xfree86 at the very least.
+ This is an error since --with-x was requested." >&5
+ echo "$as_me: error: X development files not found. Wine will be built
+ without X support, which probably isn't what you want. You will need to install
+ development packages of Xlib/Xfree86 at the very least.
+ This is an error since --with-x was requested." >&2;}
+ { (exit 1); exit 1; }; } ;;
+ esac
fi
+
XML2LIBS=""
XML2INCL=""
@@@ -10801,16 -11589,18 +11590,18 @@@ XSLTLIBS="
XSLTINCL=""
- ac_save_CPPFLAGS="$CPPFLAGS"
- if test "$PKG_CONFIG" != "false"
+ if test "x$with_xml" != "xno"
then
- ac_xml_libs="`$PKG_CONFIG --libs libxml-2.0 2>/dev/null`"
- ac_xml_cflags="`$PKG_CONFIG --cflags libxml-2.0 2>/dev/null`"
- else
- ac_xml_libs="`xml2-config --libs 2>/dev/null`"
- ac_xml_cflags="`xml2-config --cflags 2>/dev/null`"
- fi
- CPPFLAGS="$CPPFLAGS $ac_xml_cflags"
+ ac_save_CPPFLAGS="$CPPFLAGS"
+ if test "$PKG_CONFIG" != "false"
+ then
+ ac_xml_libs="`$PKG_CONFIG --libs libxml-2.0 2>/dev/null`"
+ ac_xml_cflags="`$PKG_CONFIG --cflags libxml-2.0 2>/dev/null`"
+ else
+ ac_xml_libs="`xml2-config --libs 2>/dev/null`"
+ ac_xml_cflags="`xml2-config --cflags 2>/dev/null`"
+ fi
+ CPPFLAGS="$CPPFLAGS $ac_xml_cflags"
for ac_header in libxml/parser.h
do
@@@ -11018,11 -11808,11 +11809,11 @@@ cat >>confdefs.h <<\_ACEO
#define HAVE_LIBXML2 1
_ACEOF
- XML2LIBS="$ac_xml_libs"
- XML2INCL="$ac_xml_cflags"
+ XML2LIBS="$ac_xml_libs"
+ XML2INCL="$ac_xml_cflags"
fi
- { echo "$as_me:$LINENO: checking for xmlReadMemory in -lxml2" >&5
+ { echo "$as_me:$LINENO: checking for xmlReadMemory in -lxml2" >&5
echo $ECHO_N "checking for xmlReadMemory in -lxml2... $ECHO_C" >&6; }
if test "${ac_cv_lib_xml2_xmlReadMemory+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@@ -11091,7 -11881,7 +11882,7 @@@ _ACEO
fi
- { echo "$as_me:$LINENO: checking for xmlNewDocPI in -lxml2" >&5
+ { echo "$as_me:$LINENO: checking for xmlNewDocPI in -lxml2" >&5
echo $ECHO_N "checking for xmlNewDocPI in -lxml2... $ECHO_C" >&6; }
if test "${ac_cv_lib_xml2_xmlNewDocPI+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@@ -11165,22 -11955,33 +11956,33 @@@ f
done
- CPPFLAGS="$ac_save_CPPFLAGS"
+ CPPFLAGS="$ac_save_CPPFLAGS"
+ fi
if test "$ac_cv_lib_xml2_xmlParseMemory" != "yes"; then
- wine_notices="$wine_notices|libxml2 development files not found.
- Wine will be built without XML support. (msxml.dll)"
+ case "x$with_xml" in
+ x) wine_notices="$wine_notices|libxml2 development files not found, XML won't be supported." ;;
+ xno) ;;
+ *) { { echo "$as_me:$LINENO: error: libxml2 development files not found, XML won't be supported.
+ This is an error since --with-xml was requested." >&5
+ echo "$as_me: error: libxml2 development files not found, XML won't be supported.
+ This is an error since --with-xml was requested." >&2;}
+ { (exit 1); exit 1; }; } ;;
+ esac
fi
- if test "$PKG_CONFIG" != "false"
+ if test "x$with_xslt" != "xno"
then
- ac_xslt_libs="`$PKG_CONFIG --libs libxslt 2>/dev/null`"
- ac_xslt_cflags="`$PKG_CONFIG --cflags libxslt 2>/dev/null`"
- else
- ac_xslt_libs="`xslt-config --libs 2>/dev/null`"
- ac_xslt_cflags="`xslt-config --cflags 2>/dev/null`"
- fi
- CPPFLAGS="$CPPFLAGS $ac_xslt_cflags"
+ if test "$PKG_CONFIG" != "false"
+ then
+ ac_xslt_libs="`$PKG_CONFIG --libs libxslt 2>/dev/null`"
+ ac_xslt_cflags="`$PKG_CONFIG --cflags libxslt 2>/dev/null`"
+ else
+ ac_xslt_libs="`xslt-config --libs 2>/dev/null`"
+ ac_xslt_cflags="`xslt-config --cflags 2>/dev/null`"
+ fi
+ ac_save_CPPFLAGS="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS $ac_xslt_cflags"
for ac_header in libxslt/pattern.h libxslt/transform.h
@@@ -11237,7 -12038,15 +12039,15 @@@ if test `eval echo '${'$as_ac_Header'}'
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
- { echo "$as_me:$LINENO: checking for xsltCompilePattern in -lxslt" >&5
+
+ fi
+
+ done
+
+ CPPFLAGS="$ac_save_CPPFLAGS"
+ if test "$ac_cv_header_libxslt_transform_h" = "yes"
+ then
+ { echo "$as_me:$LINENO: checking for xsltCompilePattern in -lxslt" >&5
echo $ECHO_N "checking for xsltCompilePattern in -lxslt... $ECHO_C" >&6; }
if test "${ac_cv_lib_xslt_xsltCompilePattern+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@@ -11306,23 -12115,123 +12116,123 @@@ _ACEO
XSLTLIBS="$ac_xslt_libs"
XSLTINCL="$ac_xslt_cflags"
- fi
+ ac_save_LIBS="$LIBS"
+ LIBS="$LIBS $ac_xslt_libs"
+
+ for ac_func in xsltInit
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ { echo "$as_me:$LINENO: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+ if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ /* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
+ #define $ac_func innocuous_$ac_func
+
+ /* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char $ac_func (); below.
+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ <limits.h> exists even on freestanding compilers. */
+ #ifdef __STDC__
+ # include <limits.h>
+ #else
+ # include <assert.h>
+ #endif
+
+ #undef $ac_func
+ /* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+ char $ac_func ();
+ /* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+ #if defined __stub_$ac_func || defined __stub___$ac_func
+ choke me
+ #endif
+
+ int
+ main ()
+ {
+ return $ac_func ();
+ ;
+ return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (ac_try="$ac_link"
+ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+ eval "$as_ac_var=yes"
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ eval "$as_ac_var=no"
fi
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ fi
+ ac_res=`eval echo '${'$as_ac_var'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+ echo "${ECHO_T}$ac_res" >&6; }
+ if test `eval echo '${'$as_ac_var'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+ #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+
+ fi
done
- CPPFLAGS="$ac_save_CPPFLAGS"
+ LIBS="$ac_save_LIBS"
+ fi
+
+ fi
+ fi
if test "$ac_cv_lib_xslt_xsltCompilePattern" != "yes"; then
- wine_notices="$wine_notices|libxslt development files not found.
- Wine will be built without xslt support. (msxml.dll)"
+ case "x$with_xslt" in
+ x) wine_notices="$wine_notices|libxslt development files not found, xslt won't be supported." ;;
+ xno) ;;
+ *) { { echo "$as_me:$LINENO: error: libxslt development files not found, xslt won't be supported.
+ This is an error since --with-xslt was requested." >&5
+ echo "$as_me: error: libxslt development files not found, xslt won't be supported.
+ This is an error since --with-xslt was requested." >&2;}
+ { (exit 1); exit 1; }; } ;;
+ esac
fi
HALINCL=""
- if test "$PKG_CONFIG" != "false"
+ if test "x$with_hal" != "xno" -a "$PKG_CONFIG" != "false"
then
ac_save_CPPFLAGS="$CPPFLAGS"
ac_hal_libs="`$PKG_CONFIG --libs hal 2>/dev/null`"
@@@ -11622,8 -12531,15 +12532,15 @@@ f
CPPFLAGS="$ac_save_CPPFLAGS"
fi
if test "x$ac_cv_lib_soname_hal" = "x"; then
- wine_notices="$wine_notices|libhal development files not found.
- Wine will be built without dynamic device support. (explorer.exe)"
+ case "x$with_hal" in
+ x) wine_notices="$wine_notices|libhal development files not found, no dynamic device support." ;;
+ xno) ;;
+ *) { { echo "$as_me:$LINENO: error: libhal development files not found, no dynamic device support.
+ This is an error since --with-hal was requested." >&5
+ echo "$as_me: error: libhal development files not found, no dynamic device support.
+ This is an error since --with-hal was requested." >&2;}
+ { (exit 1); exit 1; }; } ;;
+ esac
fi
@@@ -11887,8 -12803,15 +12804,15 @@@ don
LIBS="$ac_save_LIBS"
if test "x$ac_cv_lib_soname_curses$ac_cv_lib_soname_ncurses" = "x"; then
- wine_notices="$wine_notices|lib(n)curses development files not found.
- Wine will be built without (n)curses support. (wineconsole.exe)"
+ case "x$with_curses" in
+ x) wine_notices="$wine_notices|lib(n)curses development files not found, curses won't be supported." ;;
+ xno) ;;
+ *) { { echo "$as_me:$LINENO: error: lib(n)curses development files not found, curses won't be supported.
+ This is an error since --with-curses was requested." >&5
+ echo "$as_me: error: lib(n)curses development files not found, curses won't be supported.
+ This is an error since --with-curses was requested." >&2;}
+ { (exit 1); exit 1; }; } ;;
+ esac
fi
@@@ -11930,7 -12853,7 +12854,7 @@@ echo "${ECHO_T}no" >&6;
fi
- if test "$sane_devel" != "no"
+ if test "$sane_devel" != "no" -a "x$with_sane" != "xno"
then
ac_sane_incl="`$sane_devel --cflags`"
ac_save_CPPFLAGS="$CPPFLAGS"
@@@ -12151,8 -13074,15 +13075,15 @@@ f
CPPFLAGS="$ac_save_CPPFLAGS"
fi
if test "x$ac_cv_lib_soname_sane" = "x"; then
- wine_notices="$wine_notices|libsane development files not found.
- Wine will be built without scanner support. (sane.ds/twain_32.dll)"
+ case "x$with_sane" in
+ x) wine_notices="$wine_notices|libsane development files not found, scanners won't be supported." ;;
+ xno) ;;
+ *) { { echo "$as_me:$LINENO: error: libsane development files not found, scanners won't be supported.
+ This is an error since --with-sane was requested." >&5
+ echo "$as_me: error: libsane development files not found, scanners won't be supported.
+ This is an error since --with-sane was requested." >&2;}
+ { (exit 1); exit 1; }; } ;;
+ esac
fi
@@@ -12232,7 -13162,7 +13163,7 @@@ echo "${ECHO_T}no" >&6;
fi
- if test "$gphoto2_devel" != "no" -a "$gphoto2port_devel" != "no"
+ if test "$gphoto2_devel" != "no" -a "$gphoto2port_devel" != "no" -a "x$with_gphoto" != "xno"
then
ac_gphoto2_incl="`$gphoto2_devel --cflags` `$gphoto2port_devel --cflags`"
ac_gphoto2_libs=""
@@@ -12455,90 -13385,17 +13386,17 @@@ f
CPPFLAGS="$ac_save_CPPFLAGS"
fi
if test "$ac_cv_lib_gphoto2_gp_camera_new" != "yes"; then
- wine_notices="$wine_notices|libgphoto2 development files not found.
- Wine will be built without Digital Camera support. (gphoto2.ds/twain_32.dll)"
- fi
-
-
-
- if test "$ac_cv_header_unicode_ubidi_h" = "yes"
- then
- saved_libs="$LIBS"
- icu_libs="-lsicuuc -lsicudata -lstdc++ -lgcc_s"
- if test -n "$ICU_LIB_DIR"
- then
- icu_libs="-L$ICU_LIB_DIR $icu_libs"
- fi
- { echo "$as_me:$LINENO: checking whether can link with ICU libraries" >&5
- echo $ECHO_N "checking whether can link with ICU libraries... $ECHO_C" >&6; }
- LIBS="$saved_libs $icu_libs"
- if test "$cross_compiling" = yes; then
- { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
- else
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- #include <unicode/ubidi.h>
- int
- main ()
- {
- ubidi_open()
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest$ac_exeext
- if { (ac_try="$ac_link"
- case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
+ case "x$with_gphoto" in
+ x) wine_notices="$wine_notices|libgphoto2 development files not found, digital cameras won't be supported." ;;
+ xno) ;;
+ *) { { echo "$as_me:$LINENO: error: libgphoto2 development files not found, digital cameras won't be supported.
+ This is an error since --with-gphoto was requested." >&5
+ echo "$as_me: error: libgphoto2 development files not found, digital cameras won't be supported.
+ This is an error since --with-gphoto was requested." >&2;}
+ { (exit 1); exit 1; }; } ;;
esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_ICU 1
- _ACEOF
-
- ICULIBS="$icu_libs"
-
- { echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6; }
- else
- echo "$as_me: program exited with status $ac_status" >&5
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ( exit $ac_status )
- { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
fi
- rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
-
- LIBS="$saved_libs"
- fi
- if test "x$ICULIBS" = "x"; then
- wine_notices="$wine_notices|libicu development files not found.
- Wine will be built without bidi (Right to Left) support. (gdi32.dll)"
- fi
RESOLVLIBS=""
@@@ -12693,8 -13550,15 +13551,15 @@@ f
fi
if test "$ac_cv_lib_lcms_cmsOpenProfileFromFile" != "yes"; then
- wine_notices="$wine_notices|liblcms development files not found.
- Wine will be built without Color Management support. (mscms.dll)"
+ case "x$with_cms" in
+ x) wine_notices="$wine_notices|liblcms development files not found, Color Management won't be supported." ;;
+ xno) ;;
+ *) { { echo "$as_me:$LINENO: error: liblcms development files not found, Color Management won't be supported.
+ This is an error since --with-cms was requested." >&5
+ echo "$as_me: error: liblcms development files not found, Color Management won't be supported.
+ This is an error since --with-cms was requested." >&2;}
+ { (exit 1); exit 1; }; } ;;
+ esac
fi
@@@ -12842,11 -13706,19 +13707,19 @@@ LIBS="$LIBS $LDAPLIBS $LIBPTHREAD
+
+
+
+
for ac_func in \
ldap_count_references \
ldap_first_reference \
ldap_next_reference \
- ldap_parse_reference
+ ldap_parse_reference \
+ ldap_parse_sort_control \
+ ldap_parse_sortresponse_control \
+ ldap_parse_vlv_control \
+ ldap_parse_vlvresponse_control
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
{ echo "$as_me:$LINENO: checking for $ac_func" >&5
@@@ -12942,8 -13814,15 +13815,15 @@@ don
LIBS="$ac_wine_check_funcs_save_LIBS"
fi
if test "x$LDAPLIBS" = "x"; then
- wine_notices="$wine_notices|libldap (OpenLDAP) development files not found.
- Wine will be built without LDAP support. (wldap32.dll)"
+ case "x$with_ldap" in
+ x) wine_notices="$wine_notices|libldap (OpenLDAP) development files not found, LDAP won't be supported." ;;
+ xno) ;;
+ *) { { echo "$as_me:$LINENO: error: libldap (OpenLDAP) development files not found, LDAP won't be supported.
+ This is an error since --with-ldap was requested." >&5
+ echo "$as_me: error: libldap (OpenLDAP) development files not found, LDAP won't be supported.
+ This is an error since --with-ldap was requested." >&2;}
+ { (exit 1); exit 1; }; } ;;
+ esac
fi
@@@ -13087,9 -13966,11 +13967,11 @@@ f
+
for ac_header in ft2build.h \
freetype/freetype.h \
freetype/ftglyph.h \
+ freetype/fttypes.h \
freetype/tttables.h \
freetype/ftnames.h \
freetype/ftsnames.h \
@@@ -13111,8 -13992,8 +13993,8 @@@ _ACEO
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
- #if HAVE_FT2BUILD_H
- #include <ft2build.h>
+ #ifdef HAVE_FT2BUILD_H
+ # include <ft2build.h>
#endif
#include <$ac_header>
@@@ -13371,11 -14252,7 +14253,7 @@@ _ACEO
fi
fi
- if test "$FONTFORGE" = "false"
- then
- wine_warnings="$wine_warnings|FontForge is missing.
- Fonts will not be built. Dialog text may be invisible or unaligned."
- elif test "x$FREETYPELIBS" = "x"
+ if test "x$FREETYPELIBS" = "x"
then
wine_warnings="$wine_warnings|FreeType development files not found.
Fonts will not be built. Dialog text may be invisible or unaligned."
@@@ -13899,7 -14776,7 +14777,7 @@@ echo "${ECHO_T}no" >&6;
fi
- if test x$ESDCONFIG != x -a x$ESDCONFIG != x'"$ESDCONFIG"';
+ if test "x$with_esd" != xno -a "x$ESDCONFIG" != x -a "x$ESDCONFIG" != x'"$ESDCONFIG"';
then
ESD_CFLAGS=""
for i in `$ESDCONFIG --cflags`
@@@ -14266,8 -15143,15 +15144,15 @@@ f
fi
if test "x$ac_cv_lib_soname_capi20" = "x"; then
- wine_notices="$wine_notices|libcapi20 development files not found.
- Wine will be built without ISDN support. (capi2032.dll)"
+ case "x$with_capi" in
+ x) wine_notices="$wine_notices|libcapi20 development files not found, ISDN won't be supported." ;;
+ xno) ;;
+ *) { { echo "$as_me:$LINENO: error: libcapi20 development files not found, ISDN won't be supported.
+ This is an error since --with-capi was requested." >&5
+ echo "$as_me: error: libcapi20 development files not found, ISDN won't be supported.
+ This is an error since --with-capi was requested." >&2;}
+ { (exit 1); exit 1; }; } ;;
+ esac
fi
@@@ -14353,8 -15237,15 +15238,15 @@@ f
fi
if test "x$ac_cv_lib_soname_cups" = "x"; then
- wine_notices="$wine_notices|libcups development files not found.
- Wine will be built without CUPS support."
+ case "x$with_cups" in
+ x) wine_notices="$wine_notices|libcups development files not found, CUPS won't be supported." ;;
+ xno) ;;
+ *) { { echo "$as_me:$LINENO: error: libcups development files not found, CUPS won't be supported.
+ This is an error since --with-cups was requested." >&5
+ echo "$as_me: error: libcups development files not found, CUPS won't be supported.
+ This is an error since --with-cups was requested." >&2;}
+ { (exit 1); exit 1; }; } ;;
+ esac
fi
@@@ -14520,10 -15411,251 +15412,251 @@@ _ACEO
fi
+ elif test -n "$X_CFLAGS" -a "x$with_fontconfig" != "xno"
+ then
+ ac_save_CPPFLAGS="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS $X_CFLAGS"
+ $as_unset ac_cv_header_fontconfig_fontconfig_h
+
+ for ac_header in fontconfig/fontconfig.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ { echo "$as_me:$LINENO: checking for $ac_header" >&5
+ echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+ ac_res=`eval echo '${'$as_ac_Header'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+ echo "${ECHO_T}$ac_res" >&6; }
+ else
+ # Is the header compilable?
+ { echo "$as_me:$LINENO: checking $ac_header usability" >&5
+ echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ $ac_includes_default
+ #include <$ac_header>
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (ac_try="$ac_compile"
+ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_header_compiler=yes
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_compiler=no
+ fi
+
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ { echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+ echo "${ECHO_T}$ac_header_compiler" >&6; }
+
+ # Is the header present?
+ { echo "$as_me:$LINENO: checking $ac_header presence" >&5
+ echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ #include <$ac_header>
+ _ACEOF
+ if { (ac_try="$ac_cpp conftest.$ac_ext"
+ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ ac_header_preproc=yes
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_preproc=no
+ fi
+
+ rm -f conftest.err conftest.$ac_ext
+ { echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+ echo "${ECHO_T}$ac_header_preproc" >&6; }
+
+ # So? What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+ echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+ echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+ echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+ echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+ echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
+ echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+ echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+ ( cat <<\_ASBOX
+ ## ------------------------------------ ##
+ ## Report this to wine-devel at winehq.org ##
+ ## ------------------------------------ ##
+ _ASBOX
+ ) | sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+ esac
+ { echo "$as_me:$LINENO: checking for $ac_header" >&5
+ echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+ ac_res=`eval echo '${'$as_ac_Header'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+ echo "${ECHO_T}$ac_res" >&6; }
+
+ fi
+ if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+ #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+
+ fi
+
+ done
+
+ CPPFLAGS="$ac_save_CPPFLAGS"
+ if test "$ac_cv_header_fontconfig_fontconfig_h" = "yes"
+ then
+ FONTCONFIGINCL="$X_CFLAGS"
+
+ { echo "$as_me:$LINENO: checking for -lfontconfig" >&5
+ echo $ECHO_N "checking for -lfontconfig... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_soname_fontconfig+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_check_soname_save_LIBS=$LIBS
+ LIBS="-lfontconfig $X_LIBS $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+
+ /* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+ char FcInit ();
+ int
+ main ()
+ {
+ return FcInit ();
+ ;
+ return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (ac_try="$ac_link"
+ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+ case "$LIBEXT" in
+ dll) ;;
+ dylib) ac_cv_lib_soname_fontconfig=`otool -L conftest$ac_exeext | grep "libfontconfig\\.[0-9A-Za-z.]*dylib" | sed -e "s/^.*\/\(libfontconfig\.[0-9A-Za-z.]*dylib\).*$/\1/"';2,$d'` ;;
+ *) ac_cv_lib_soname_fontconfig=`$ac_cv_path_LDD conftest$ac_exeext | grep "libfontconfig\\.$LIBEXT" | sed -e "s/^.*\(libfontconfig\.$LIBEXT[^ ]*\).*$/\1/"';2,$d'` ;;
+ esac
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+
+ fi
+
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_soname_save_LIBS
fi
if test "x$ac_cv_lib_soname_fontconfig" = "x"; then
- wine_notices="$wine_notices|fontconfig development files not found.
- Wine will be built without fontconfig support."
+ { echo "$as_me:$LINENO: result: not found" >&5
+ echo "${ECHO_T}not found" >&6; }
+
+ else
+ { echo "$as_me:$LINENO: result: $ac_cv_lib_soname_fontconfig" >&5
+ echo "${ECHO_T}$ac_cv_lib_soname_fontconfig" >&6; }
+
+ cat >>confdefs.h <<_ACEOF
+ #define SONAME_LIBFONTCONFIG "$ac_cv_lib_soname_fontconfig"
+ _ACEOF
+
+
+ fi
+
+ fi
+ fi
+ if test "x$ac_cv_lib_soname_fontconfig" = "x"; then
+ case "x$with_fontconfig" in
+ x) wine_notices="$wine_notices|fontconfig development files not found, fontconfig won't be supported." ;;
+ xno) ;;
+ *) { { echo "$as_me:$LINENO: error: fontconfig development files not found, fontconfig won't be supported.
+ This is an error since --with-fontconfig was requested." >&5
+ echo "$as_me: error: fontconfig development files not found, fontconfig won't be supported.
+ This is an error since --with-fontconfig was requested." >&2;}
+ { (exit 1); exit 1; }; } ;;
+ esac
fi
@@@ -14687,8 -15819,15 +15820,15 @@@ f
fi
if test "x$ac_cv_lib_soname_ssl" = "x"; then
- wine_notices="$wine_notices|OpenSSL development files not found.
- Wine will be built without SSL support. (wininet.dll)"
+ case "x$with_openssl" in
+ x) wine_notices="$wine_notices|OpenSSL development files not found, SSL won't be supported." ;;
+ xno) ;;
+ *) { { echo "$as_me:$LINENO: error: OpenSSL development files not found, SSL won't be supported.
+ This is an error since --with-openssl was requested." >&5
+ echo "$as_me: error: OpenSSL development files not found, SSL won't be supported.
+ This is an error since --with-openssl was requested." >&2;}
+ { (exit 1); exit 1; }; } ;;
+ esac
fi
@@@ -14774,8 -15913,15 +15914,15 @@@ f
fi
if test "x$ac_cv_lib_soname_jpeg" = "x"; then
- wine_notices="$wine_notices|libjpeg development files not found.
- Wine will be built without JPEG support. (oleaut32.dll)"
+ case "x$with_jpeg" in
+ x) wine_notices="$wine_notices|libjpeg development files not found, JPEG won't be supported." ;;
+ xno) ;;
+ *) { { echo "$as_me:$LINENO: error: libjpeg development files not found, JPEG won't be supported.
+ This is an error since --with-jpeg was requested." >&5
+ echo "$as_me: error: libjpeg development files not found, JPEG won't be supported.
+ This is an error since --with-jpeg was requested." >&2;}
+ { (exit 1); exit 1; }; } ;;
+ esac
fi
@@@ -14861,18 -16007,108 +16008,108 @@@ f
fi
if test "x$ac_cv_lib_soname_png" = "x"; then
- wine_notices="$wine_notices|libpng development files not found.
- Wine will be built without PNG support. (oleaut32.dll)"
+ case "x$with_png" in
+ x) wine_notices="$wine_notices|libpng development files not found, PNG won't be supported." ;;
+ xno) ;;
+ *) { { echo "$as_me:$LINENO: error: libpng development files not found, PNG won't be supported.
+ This is an error since --with-png was requested." >&5
+ echo "$as_me: error: libpng development files not found, PNG won't be supported.
+ This is an error since --with-png was requested." >&2;}
+ { (exit 1); exit 1; }; } ;;
+ esac
fi
- if test "x$ALSALIBS$AUDIOIOLIBS$COREAUDIO$NASLIBS$ESD_LIBS$ac_cv_lib_soname_jack" = "x" -a \
- "$ac_cv_header_sys_soundcard_h" != "yes" -a \
- "$ac_cv_header_machine_soundcard_h" != "yes" -a \
- "$ac_cv_header_soundcard_h" != "yes"; then
- wine_warnings="$wine_warnings|No sound system was found. Windows applications will be silent."
+ { echo "$as_me:$LINENO: checking for -lodbc" >&5
+ echo $ECHO_N "checking for -lodbc... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_soname_odbc+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_check_soname_save_LIBS=$LIBS
+ LIBS="-lodbc $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+
+ /* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+ char SQLConnect ();
+ int
+ main ()
+ {
+ return SQLConnect ();
+ ;
+ return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (ac_try="$ac_link"
+ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+ case "$LIBEXT" in
+ dll) ;;
+ dylib) ac_cv_lib_soname_odbc=`otool -L conftest$ac_exeext | grep "libodbc\\.[0-9A-Za-z.]*dylib" | sed -e "s/^.*\/\(libodbc\.[0-9A-Za-z.]*dylib\).*$/\1/"';2,$d'` ;;
+ *) ac_cv_lib_soname_odbc=`$ac_cv_path_LDD conftest$ac_exeext | grep "libodbc\\.$LIBEXT" | sed -e "s/^.*\(libodbc\.$LIBEXT[^ ]*\).*$/\1/"';2,$d'` ;;
+ esac
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+
fi
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_soname_save_LIBS
+ fi
+ if test "x$ac_cv_lib_soname_odbc" = "x"; then
+ { echo "$as_me:$LINENO: result: not found" >&5
+ echo "${ECHO_T}not found" >&6; }
+ cat >>confdefs.h <<_ACEOF
+ #define SONAME_LIBODBC "libodbc.$LIBEXT"
+ _ACEOF
+
+ else
+ { echo "$as_me:$LINENO: result: $ac_cv_lib_soname_odbc" >&5
+ echo "${ECHO_T}$ac_cv_lib_soname_odbc" >&6; }
+
+ cat >>confdefs.h <<_ACEOF
+ #define SONAME_LIBODBC "$ac_cv_lib_soname_odbc"
+ _ACEOF
+
+
+ fi
+
+
+ if test "x$ALSALIBS$AUDIOIOLIBS$COREAUDIO$NASLIBS$ESD_LIBS$ac_cv_lib_soname_jack" = "x" -a \
+ "$ac_cv_header_sys_soundcard_h" != "yes" -a \
+ "$ac_cv_header_machine_soundcard_h" != "yes" -a \
+ "$ac_cv_header_soundcard_h" != "yes" -a \
+ "x$with_alsa$with_audioio$with_coreaudio$with_nas$with_esd$with_jack$with_oss" != xnonononononono
+ then
+ wine_warnings="$wine_warnings|No sound system was found. Windows applications will be silent."
+ fi
EXTRACFLAGS=""
@@@ -15188,6 -16424,64 +16425,64 @@@ if test $ac_cv_cflags__Wwrite_strings
EXTRACFLAGS="$EXTRACFLAGS -Wwrite-strings"
fi
+ { echo "$as_me:$LINENO: checking whether the compiler supports -Wtype-limits" >&5
+ echo $ECHO_N "checking whether the compiler supports -Wtype-limits... $ECHO_C" >&6; }
+ if test "${ac_cv_cflags__Wtype_limits+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_wine_try_cflags_saved=$CFLAGS
+ CFLAGS="$CFLAGS -Wtype-limits"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+
+ int
+ main ()
+ {
+
+ ;
+ return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (ac_try="$ac_link"
+ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+ ac_cv_cflags__Wtype_limits=yes
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_cflags__Wtype_limits=no
+ fi
+
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS=$ac_wine_try_cflags_saved
+ fi
+ { echo "$as_me:$LINENO: result: $ac_cv_cflags__Wtype_limits" >&5
+ echo "${ECHO_T}$ac_cv_cflags__Wtype_limits" >&6; }
+ if test $ac_cv_cflags__Wtype_limits = yes; then
+ EXTRACFLAGS="$EXTRACFLAGS -Wtype-limits"
+ fi
+
saved_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -Wpointer-arith -Werror"
@@@ -15306,67 -16600,6 +16601,67 @@@ echo "${ECHO_T}$ac_cv_c_builtin_wchar_c
fi
fi
+EXECSTACK=""
+
+saved_LDFLAGS="$LDFLAGS"
+LDFLAGS="$LDFLAGS -z execstack"
+{ echo "$as_me:$LINENO: checking for -z execstack" >&5
+echo $ECHO_N "checking for -z execstack... $ECHO_C" >&6; }
+if test "${ac_cv_z_execstack+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+int
+main ()
+{
+int main(void) {return 0;}
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+ ac_cv_z_execstack=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_z_execstack=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_z_execstack" >&5
+echo "${ECHO_T}$ac_cv_z_execstack" >&6; }
+if test $ac_cv_z_execstack
+then
+ EXECSTACK="-z execstack"
+fi
+LDFLAGS="$saved_LDFLAGS"
+
{ echo "$as_me:$LINENO: checking how to define a function in assembly code" >&5
echo $ECHO_N "checking how to define a function in assembly code... $ECHO_C" >&6; }
@@@ -15634,6 -16867,11 +16929,11 @@@ MAIN_BINARY="wine-pthread
EXTRA_BINARIES="wine-kthread wine-pthread wine-preloader"
;;
+ freebsd*)
+ MAIN_BINARY="wine-freebsd"
+
+ EXTRA_BINARIES="wine-pthread"
+ ;;
esac
;;
esac
@@@ -15700,13 -16938,24 +17000,24 @@@
+
+
+
+
+
+
+
+
for ac_func in \
_pclose \
_popen \
_snprintf \
_spawnvp \
+ _strdup \
_stricmp \
_strnicmp \
+ _strtoi64 \
+ _strtoui64 \
_vsnprintf \
asctime_r \
chsize \
@@@ -15744,6 -16993,7 +17055,7 @@@
rfork \
sched_yield \
select \
+ setproctitle \
setrlimit \
settimeofday \
sigaltstack \
@@@ -15753,10 -17003,14 +17065,14 @@@
statfs \
statvfs \
strcasecmp \
+ strdup \
strerror \
strncasecmp \
strtold \
+ strtoll \
+ strtoull \
tcgetattr \
+ thr_kill2 \
timegm \
usleep \
vsnprintf \
@@@ -17440,13 -18694,13 +18756,13 @@@ in
main ()
{
- char *name=NULL;
+ char *name=0;
struct hostent he;
struct hostent *result;
- char *buf=NULL;
+ char *buf=0;
int bufsize=0;
int res,errnr;
- char *addr=NULL;
+ char *addr=0;
int addrlen=0;
int addrtype=0;
res=gethostbyname_r(name,&he,buf,bufsize,&result,&errnr);
@@@ -20011,6 -21265,66 +21327,66 @@@ _ACEO
fi
+ { echo "$as_me:$LINENO: checking for isinf" >&5
+ echo $ECHO_N "checking for isinf... $ECHO_C" >&6; }
+ if test "${ac_cv_have_isinf+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ #include <math.h>
+ int
+ main ()
+ {
+ float f = 0.0; isinf(f)
+ ;
+ return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (ac_try="$ac_link"
+ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+ ac_cv_have_isinf="yes"
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_have_isinf="no"
+ fi
+
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ fi
+ { echo "$as_me:$LINENO: result: $ac_cv_have_isinf" >&5
+ echo "${ECHO_T}$ac_cv_have_isinf" >&6; }
+ if test "$ac_cv_have_isinf" = "yes"
+ then
+
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_ISINF 1
+ _ACEOF
+
+ fi
+
case $host_cpu in
*i[3456789]86*) { echo "$as_me:$LINENO: checking whether we need to define __i386__" >&5
@@@ -20214,6 -21528,7 +21590,7 @@@ Makefile: dumm
\$(OBJS): \$(IDL_GEN_HEADERS)
\$(IDL_GEN_C_SRCS:.c=.o): \$(IDL_GEN_C_SRCS)
+ \$(RC_SRCS:.rc=.res): \$(IDL_TLB_SRCS:.idl=.tlb)
\$(LEX_SRCS:.l=.yy.o): \$(LEX_SRCS:.l=.yy.c)
\$(BISON_SRCS:.y=.tab.o): \$(BISON_SRCS:.y=.tab.c)"
@@@ -20270,6 -21585,10 +21647,10 @@@ ac_config_files="$ac_config_files dlls/
ac_config_files="$ac_config_files dlls/activeds/Makefile"
+ ac_config_files="$ac_config_files dlls/actxprxy/Makefile"
+
+ ac_config_files="$ac_config_files dlls/adsiid/Makefile"
+
ac_config_files="$ac_config_files dlls/advapi32/Makefile"
ac_config_files="$ac_config_files dlls/advapi32/tests/Makefile"
@@@ -20318,16 -21637,26 +21699,26 @@@ ac_config_files="$ac_config_files dlls/
ac_config_files="$ac_config_files dlls/credui/Makefile"
+ ac_config_files="$ac_config_files dlls/credui/tests/Makefile"
+
ac_config_files="$ac_config_files dlls/crtdll/Makefile"
ac_config_files="$ac_config_files dlls/crypt32/Makefile"
ac_config_files="$ac_config_files dlls/crypt32/tests/Makefile"
+ ac_config_files="$ac_config_files dlls/cryptdlg/Makefile"
+
ac_config_files="$ac_config_files dlls/cryptdll/Makefile"
ac_config_files="$ac_config_files dlls/cryptnet/Makefile"
+ ac_config_files="$ac_config_files dlls/cryptnet/tests/Makefile"
+
+ ac_config_files="$ac_config_files dlls/cryptui/Makefile"
+
+ ac_config_files="$ac_config_files dlls/ctapi32/Makefile"
+
ac_config_files="$ac_config_files dlls/ctl3d32/Makefile"
ac_config_files="$ac_config_files dlls/d3d10/Makefile"
@@@ -20348,6 -21677,38 +21739,38 @@@ ac_config_files="$ac_config_files dlls/
ac_config_files="$ac_config_files dlls/d3dx8/Makefile"
+ ac_config_files="$ac_config_files dlls/d3dx8/tests/Makefile"
+
+ ac_config_files="$ac_config_files dlls/d3dx9_24/Makefile"
+
+ ac_config_files="$ac_config_files dlls/d3dx9_25/Makefile"
+
+ ac_config_files="$ac_config_files dlls/d3dx9_26/Makefile"
+
+ ac_config_files="$ac_config_files dlls/d3dx9_27/Makefile"
+
+ ac_config_files="$ac_config_files dlls/d3dx9_28/Makefile"
+
+ ac_config_files="$ac_config_files dlls/d3dx9_29/Makefile"
+
+ ac_config_files="$ac_config_files dlls/d3dx9_30/Makefile"
+
+ ac_config_files="$ac_config_files dlls/d3dx9_31/Makefile"
+
+ ac_config_files="$ac_config_files dlls/d3dx9_32/Makefile"
+
+ ac_config_files="$ac_config_files dlls/d3dx9_33/Makefile"
+
+ ac_config_files="$ac_config_files dlls/d3dx9_34/Makefile"
+
+ ac_config_files="$ac_config_files dlls/d3dx9_35/Makefile"
+
+ ac_config_files="$ac_config_files dlls/d3dx9_36/Makefile"
+
+ ac_config_files="$ac_config_files dlls/d3dx9_36/tests/Makefile"
+
+ ac_config_files="$ac_config_files dlls/d3dx9_37/Makefile"
+
ac_config_files="$ac_config_files dlls/d3dxof/Makefile"
ac_config_files="$ac_config_files dlls/dbghelp/Makefile"
@@@ -20402,10 -21763,14 +21825,14 @@@ ac_config_files="$ac_config_files dlls/
ac_config_files="$ac_config_files dlls/dpnhpast/Makefile"
+ ac_config_files="$ac_config_files dlls/dpnlobby/Makefile"
+
ac_config_files="$ac_config_files dlls/dsound/Makefile"
ac_config_files="$ac_config_files dlls/dsound/tests/Makefile"
+ ac_config_files="$ac_config_files dlls/dssenh/Makefile"
+
ac_config_files="$ac_config_files dlls/dswave/Makefile"
ac_config_files="$ac_config_files dlls/dwmapi/Makefile"
@@@ -20418,6 -21783,12 +21845,12 @@@ ac_config_files="$ac_config_files dlls/
ac_config_files="$ac_config_files dlls/dxguid/Makefile"
+ ac_config_files="$ac_config_files dlls/faultrep/Makefile"
+
+ ac_config_files="$ac_config_files dlls/fusion/Makefile"
+
+ ac_config_files="$ac_config_files dlls/fusion/tests/Makefile"
+
ac_config_files="$ac_config_files dlls/gdi32/Makefile"
ac_config_files="$ac_config_files dlls/gdi32/tests/Makefile"
@@@ -20430,6 -21801,8 +21863,8 @@@ ac_config_files="$ac_config_files dlls/
ac_config_files="$ac_config_files dlls/gphoto2.ds/Makefile"
+ ac_config_files="$ac_config_files dlls/gpkcsp/Makefile"
+
ac_config_files="$ac_config_files dlls/hal/Makefile"
ac_config_files="$ac_config_files dlls/hhctrl.ocx/Makefile"
@@@ -20454,20 -21827,36 +21889,36 @@@ ac_config_files="$ac_config_files dlls/
ac_config_files="$ac_config_files dlls/imm32/Makefile"
+ ac_config_files="$ac_config_files dlls/imm32/tests/Makefile"
+
+ ac_config_files="$ac_config_files dlls/inetcomm/Makefile"
+
+ ac_config_files="$ac_config_files dlls/inetcomm/tests/Makefile"
+
ac_config_files="$ac_config_files dlls/infosoft/Makefile"
ac_config_files="$ac_config_files dlls/infosoft/tests/Makefile"
+ ac_config_files="$ac_config_files dlls/initpki/Makefile"
+
+ ac_config_files="$ac_config_files dlls/inkobj/Makefile"
+
ac_config_files="$ac_config_files dlls/inseng/Makefile"
ac_config_files="$ac_config_files dlls/iphlpapi/Makefile"
ac_config_files="$ac_config_files dlls/iphlpapi/tests/Makefile"
+ ac_config_files="$ac_config_files dlls/itircl/Makefile"
+
ac_config_files="$ac_config_files dlls/itss/Makefile"
ac_config_files="$ac_config_files dlls/itss/tests/Makefile"
+ ac_config_files="$ac_config_files dlls/jscript/Makefile"
+
+ ac_config_files="$ac_config_files dlls/jscript/tests/Makefile"
+
ac_config_files="$ac_config_files dlls/kernel32/Makefile"
ac_config_files="$ac_config_files dlls/kernel32/tests/Makefile"
@@@ -20506,6 -21895,8 +21957,8 @@@ ac_config_files="$ac_config_files dlls/
ac_config_files="$ac_config_files dlls/monodebg.vxd/Makefile"
+ ac_config_files="$ac_config_files dlls/mountmgr.sys/Makefile"
+
ac_config_files="$ac_config_files dlls/mpr/Makefile"
ac_config_files="$ac_config_files dlls/mprapi/Makefile"
@@@ -20518,6 -21909,8 +21971,8 @@@ ac_config_files="$ac_config_files dlls/
ac_config_files="$ac_config_files dlls/msadp32.acm/Makefile"
+ ac_config_files="$ac_config_files dlls/mscat32/Makefile"
+
ac_config_files="$ac_config_files dlls/mscms/Makefile"
ac_config_files="$ac_config_files dlls/mscms/tests/Makefile"
@@@ -20530,6 -21923,8 +21985,8 @@@ ac_config_files="$ac_config_files dlls/
ac_config_files="$ac_config_files dlls/msg711.acm/Makefile"
+ ac_config_files="$ac_config_files dlls/mshtml.tlb/Makefile"
+
ac_config_files="$ac_config_files dlls/mshtml/Makefile"
ac_config_files="$ac_config_files dlls/mshtml/tests/Makefile"
@@@ -20540,12 -21935,20 +21997,20 @@@ ac_config_files="$ac_config_files dlls/
ac_config_files="$ac_config_files dlls/msimg32/Makefile"
+ ac_config_files="$ac_config_files dlls/msimtf/Makefile"
+
ac_config_files="$ac_config_files dlls/msisys.ocx/Makefile"
ac_config_files="$ac_config_files dlls/msnet32/Makefile"
ac_config_files="$ac_config_files dlls/msrle32/Makefile"
+ ac_config_files="$ac_config_files dlls/mssip32/Makefile"
+
+ ac_config_files="$ac_config_files dlls/msvcirt/Makefile"
+
+ ac_config_files="$ac_config_files dlls/msvcr71/Makefile"
+
ac_config_files="$ac_config_files dlls/msvcrt/Makefile"
ac_config_files="$ac_config_files dlls/msvcrt/tests/Makefile"
@@@ -20582,6 -21985,8 +22047,8 @@@ ac_config_files="$ac_config_files dlls/
ac_config_files="$ac_config_files dlls/ntdsapi/Makefile"
+ ac_config_files="$ac_config_files dlls/ntdsapi/tests/Makefile"
+
ac_config_files="$ac_config_files dlls/ntoskrnl.exe/Makefile"
ac_config_files="$ac_config_files dlls/ntprint/Makefile"
@@@ -20614,8 -22019,12 +22081,12 @@@ ac_config_files="$ac_config_files dlls/
ac_config_files="$ac_config_files dlls/olesvr32/Makefile"
+ ac_config_files="$ac_config_files dlls/olethk32/Makefile"
+
ac_config_files="$ac_config_files dlls/opengl32/Makefile"
+ ac_config_files="$ac_config_files dlls/opengl32/tests/Makefile"
+
ac_config_files="$ac_config_files dlls/pdh/Makefile"
ac_config_files="$ac_config_files dlls/pdh/tests/Makefile"
@@@ -20624,6 -22033,8 +22095,8 @@@ ac_config_files="$ac_config_files dlls/
ac_config_files="$ac_config_files dlls/printui/Makefile"
+ ac_config_files="$ac_config_files dlls/propsys/Makefile"
+
ac_config_files="$ac_config_files dlls/psapi/Makefile"
ac_config_files="$ac_config_files dlls/psapi/tests/Makefile"
@@@ -20632,6 -22043,16 +22105,16 @@@ ac_config_files="$ac_config_files dlls/
ac_config_files="$ac_config_files dlls/qcap/Makefile"
+ ac_config_files="$ac_config_files dlls/qedit/Makefile"
+
+ ac_config_files="$ac_config_files dlls/qedit/tests/Makefile"
+
+ ac_config_files="$ac_config_files dlls/qmgr/Makefile"
+
+ ac_config_files="$ac_config_files dlls/qmgr/tests/Makefile"
+
+ ac_config_files="$ac_config_files dlls/qmgrprxy/Makefile"
+
ac_config_files="$ac_config_files dlls/quartz/Makefile"
ac_config_files="$ac_config_files dlls/quartz/tests/Makefile"
@@@ -20648,20 -22069,22 +22131,22 @@@ ac_config_files="$ac_config_files dlls/
ac_config_files="$ac_config_files dlls/riched32/Makefile"
+ ac_config_files="$ac_config_files dlls/riched32/tests/Makefile"
+
ac_config_files="$ac_config_files dlls/rpcrt4/Makefile"
ac_config_files="$ac_config_files dlls/rpcrt4/tests/Makefile"
ac_config_files="$ac_config_files dlls/rsabase/Makefile"
- ac_config_files="$ac_config_files dlls/rsabase/tests/Makefile"
-
ac_config_files="$ac_config_files dlls/rsaenh/Makefile"
ac_config_files="$ac_config_files dlls/rsaenh/tests/Makefile"
ac_config_files="$ac_config_files dlls/sane.ds/Makefile"
+ ac_config_files="$ac_config_files dlls/sccbase/Makefile"
+
ac_config_files="$ac_config_files dlls/schannel/Makefile"
ac_config_files="$ac_config_files dlls/schannel/tests/Makefile"
@@@ -20702,12 -22125,20 +22187,20 @@@ ac_config_files="$ac_config_files dlls/
ac_config_files="$ac_config_files dlls/shlwapi/tests/Makefile"
+ ac_config_files="$ac_config_files dlls/slbcsp/Makefile"
+
+ ac_config_files="$ac_config_files dlls/slc/Makefile"
+
ac_config_files="$ac_config_files dlls/snmpapi/Makefile"
ac_config_files="$ac_config_files dlls/snmpapi/tests/Makefile"
+ ac_config_files="$ac_config_files dlls/softpub/Makefile"
+
ac_config_files="$ac_config_files dlls/spoolss/Makefile"
+ ac_config_files="$ac_config_files dlls/spoolss/tests/Makefile"
+
ac_config_files="$ac_config_files dlls/stdole2.tlb/Makefile"
ac_config_files="$ac_config_files dlls/stdole32.tlb/Makefile"
@@@ -20738,6 -22169,8 +22231,8 @@@ ac_config_files="$ac_config_files dlls/
ac_config_files="$ac_config_files dlls/userenv/Makefile"
+ ac_config_files="$ac_config_files dlls/userenv/tests/Makefile"
+
ac_config_files="$ac_config_files dlls/usp10/Makefile"
ac_config_files="$ac_config_files dlls/usp10/tests/Makefile"
@@@ -20800,6 -22233,8 +22295,8 @@@ ac_config_files="$ac_config_files dlls/
ac_config_files="$ac_config_files dlls/wing32/Makefile"
+ ac_config_files="$ac_config_files dlls/winhttp/Makefile"
+
ac_config_files="$ac_config_files dlls/wininet/Makefile"
ac_config_files="$ac_config_files dlls/wininet/tests/Makefile"
@@@ -20824,6 -22259,8 +22321,8 @@@ ac_config_files="$ac_config_files dlls/
ac_config_files="$ac_config_files dlls/wldap32/Makefile"
+ ac_config_files="$ac_config_files dlls/wmi/Makefile"
+
ac_config_files="$ac_config_files dlls/wnaspi32/Makefile"
ac_config_files="$ac_config_files dlls/wow32/Makefile"
@@@ -20884,6 -22321,8 +22383,8 @@@ ac_config_files="$ac_config_files progr
ac_config_files="$ac_config_files programs/progman/Makefile"
+ ac_config_files="$ac_config_files programs/reg/Makefile"
+
ac_config_files="$ac_config_files programs/regedit/Makefile"
ac_config_files="$ac_config_files programs/regsvr32/Makefile"
@@@ -20892,10 -22331,16 +22393,16 @@@ ac_config_files="$ac_config_files progr
ac_config_files="$ac_config_files programs/rundll32/Makefile"
+ ac_config_files="$ac_config_files programs/secedit/Makefile"
+
+ ac_config_files="$ac_config_files programs/services/Makefile"
+
ac_config_files="$ac_config_files programs/spoolsv/Makefile"
ac_config_files="$ac_config_files programs/start/Makefile"
+ ac_config_files="$ac_config_files programs/svchost/Makefile"
+
ac_config_files="$ac_config_files programs/taskmgr/Makefile"
ac_config_files="$ac_config_files programs/uninstaller/Makefile"
@@@ -20932,6 -22377,8 +22439,8 @@@ ac_config_files="$ac_config_files progr
ac_config_files="$ac_config_files programs/wordpad/Makefile"
+ ac_config_files="$ac_config_files programs/write/Makefile"
+
ac_config_files="$ac_config_files programs/xcopy/Makefile"
ac_config_files="$ac_config_files server/Makefile"
@@@ -21347,7 -22794,7 +22856,7 @@@ exec 6>&
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
- This file was extended by Wine $as_me 0.9.41, which was
+ This file was extended by Wine $as_me 1.0-rc1, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@@ -21400,7 -22847,7 +22909,7 @@@ Report bugs to <bug-autoconf at gnu.org>.
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
- Wine config.status 0.9.41
+ Wine config.status 1.0-rc1
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
@@@ -21525,6 -22972,8 +23034,8 @@@ d
"dlls/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/Makefile" ;;
"dlls/acledit/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/acledit/Makefile" ;;
"dlls/activeds/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/activeds/Makefile" ;;
+ "dlls/actxprxy/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/actxprxy/Makefile" ;;
+ "dlls/adsiid/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/adsiid/Makefile" ;;
"dlls/advapi32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/advapi32/Makefile" ;;
"dlls/advapi32/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/advapi32/tests/Makefile" ;;
"dlls/advpack/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/advpack/Makefile" ;;
@@@ -21549,11 -22998,16 +23060,16 @@@
"dlls/comdlg32/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/comdlg32/tests/Makefile" ;;
"dlls/compstui/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/compstui/Makefile" ;;
"dlls/credui/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/credui/Makefile" ;;
+ "dlls/credui/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/credui/tests/Makefile" ;;
"dlls/crtdll/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/crtdll/Makefile" ;;
"dlls/crypt32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/crypt32/Makefile" ;;
"dlls/crypt32/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/crypt32/tests/Makefile" ;;
+ "dlls/cryptdlg/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/cryptdlg/Makefile" ;;
"dlls/cryptdll/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/cryptdll/Makefile" ;;
"dlls/cryptnet/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/cryptnet/Makefile" ;;
+ "dlls/cryptnet/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/cryptnet/tests/Makefile" ;;
+ "dlls/cryptui/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/cryptui/Makefile" ;;
+ "dlls/ctapi32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/ctapi32/Makefile" ;;
"dlls/ctl3d32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/ctl3d32/Makefile" ;;
"dlls/d3d10/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/d3d10/Makefile" ;;
"dlls/d3d8/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/d3d8/Makefile" ;;
@@@ -21564,6 -23018,22 +23080,22 @@@
"dlls/d3drm/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/d3drm/Makefile" ;;
"dlls/d3drm/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/d3drm/tests/Makefile" ;;
"dlls/d3dx8/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/d3dx8/Makefile" ;;
+ "dlls/d3dx8/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/d3dx8/tests/Makefile" ;;
+ "dlls/d3dx9_24/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/d3dx9_24/Makefile" ;;
+ "dlls/d3dx9_25/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/d3dx9_25/Makefile" ;;
+ "dlls/d3dx9_26/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/d3dx9_26/Makefile" ;;
+ "dlls/d3dx9_27/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/d3dx9_27/Makefile" ;;
+ "dlls/d3dx9_28/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/d3dx9_28/Makefile" ;;
+ "dlls/d3dx9_29/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/d3dx9_29/Makefile" ;;
+ "dlls/d3dx9_30/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/d3dx9_30/Makefile" ;;
+ "dlls/d3dx9_31/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/d3dx9_31/Makefile" ;;
+ "dlls/d3dx9_32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/d3dx9_32/Makefile" ;;
+ "dlls/d3dx9_33/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/d3dx9_33/Makefile" ;;
+ "dlls/d3dx9_34/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/d3dx9_34/Makefile" ;;
+ "dlls/d3dx9_35/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/d3dx9_35/Makefile" ;;
+ "dlls/d3dx9_36/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/d3dx9_36/Makefile" ;;
+ "dlls/d3dx9_36/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/d3dx9_36/tests/Makefile" ;;
+ "dlls/d3dx9_37/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/d3dx9_37/Makefile" ;;
"dlls/d3dxof/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/d3dxof/Makefile" ;;
"dlls/dbghelp/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dbghelp/Makefile" ;;
"dlls/dciman32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dciman32/Makefile" ;;
@@@ -21591,20 -23061,26 +23123,26 @@@
"dlls/dpnaddr/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dpnaddr/Makefile" ;;
"dlls/dpnet/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dpnet/Makefile" ;;
"dlls/dpnhpast/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dpnhpast/Makefile" ;;
+ "dlls/dpnlobby/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dpnlobby/Makefile" ;;
"dlls/dsound/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dsound/Makefile" ;;
"dlls/dsound/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dsound/tests/Makefile" ;;
+ "dlls/dssenh/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dssenh/Makefile" ;;
"dlls/dswave/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dswave/Makefile" ;;
"dlls/dwmapi/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dwmapi/Makefile" ;;
"dlls/dxdiagn/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dxdiagn/Makefile" ;;
"dlls/dxerr8/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dxerr8/Makefile" ;;
"dlls/dxerr9/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dxerr9/Makefile" ;;
"dlls/dxguid/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dxguid/Makefile" ;;
+ "dlls/faultrep/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/faultrep/Makefile" ;;
+ "dlls/fusion/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/fusion/Makefile" ;;
+ "dlls/fusion/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/fusion/tests/Makefile" ;;
"dlls/gdi32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/gdi32/Makefile" ;;
"dlls/gdi32/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/gdi32/tests/Makefile" ;;
"dlls/gdiplus/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/gdiplus/Makefile" ;;
"dlls/gdiplus/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/gdiplus/tests/Makefile" ;;
"dlls/glu32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/glu32/Makefile" ;;
"dlls/gphoto2.ds/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/gphoto2.ds/Makefile" ;;
+ "dlls/gpkcsp/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/gpkcsp/Makefile" ;;
"dlls/hal/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/hal/Makefile" ;;
"dlls/hhctrl.ocx/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/hhctrl.ocx/Makefile" ;;
"dlls/hid/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/hid/Makefile" ;;
@@@ -21617,13 -23093,21 +23155,21 @@@
"dlls/imaadp32.acm/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/imaadp32.acm/Makefile" ;;
"dlls/imagehlp/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/imagehlp/Makefile" ;;
"dlls/imm32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/imm32/Makefile" ;;
+ "dlls/imm32/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/imm32/tests/Makefile" ;;
+ "dlls/inetcomm/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/inetcomm/Makefile" ;;
+ "dlls/inetcomm/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/inetcomm/tests/Makefile" ;;
"dlls/infosoft/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/infosoft/Makefile" ;;
"dlls/infosoft/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/infosoft/tests/Makefile" ;;
+ "dlls/initpki/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/initpki/Makefile" ;;
+ "dlls/inkobj/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/inkobj/Makefile" ;;
"dlls/inseng/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/inseng/Makefile" ;;
"dlls/iphlpapi/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/iphlpapi/Makefile" ;;
"dlls/iphlpapi/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/iphlpapi/tests/Makefile" ;;
+ "dlls/itircl/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/itircl/Makefile" ;;
"dlls/itss/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/itss/Makefile" ;;
"dlls/itss/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/itss/tests/Makefile" ;;
+ "dlls/jscript/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/jscript/Makefile" ;;
+ "dlls/jscript/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/jscript/tests/Makefile" ;;
"dlls/kernel32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/kernel32/Makefile" ;;
"dlls/kernel32/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/kernel32/tests/Makefile" ;;
"dlls/localspl/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/localspl/Makefile" ;;
@@@ -21643,26 -23127,33 +23189,33 @@@
"dlls/mlang/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/mlang/tests/Makefile" ;;
"dlls/mmdevldr.vxd/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/mmdevldr.vxd/Makefile" ;;
"dlls/monodebg.vxd/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/monodebg.vxd/Makefile" ;;
+ "dlls/mountmgr.sys/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/mountmgr.sys/Makefile" ;;
"dlls/mpr/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/mpr/Makefile" ;;
"dlls/mprapi/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/mprapi/Makefile" ;;
"dlls/msacm32.drv/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/msacm32.drv/Makefile" ;;
"dlls/msacm32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/msacm32/Makefile" ;;
"dlls/msacm32/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/msacm32/tests/Makefile" ;;
"dlls/msadp32.acm/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/msadp32.acm/Makefile" ;;
+ "dlls/mscat32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/mscat32/Makefile" ;;
"dlls/mscms/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/mscms/Makefile" ;;
"dlls/mscms/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/mscms/tests/Makefile" ;;
"dlls/mscoree/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/mscoree/Makefile" ;;
"dlls/msdmo/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/msdmo/Makefile" ;;
"dlls/msftedit/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/msftedit/Makefile" ;;
"dlls/msg711.acm/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/msg711.acm/Makefile" ;;
+ "dlls/mshtml.tlb/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/mshtml.tlb/Makefile" ;;
"dlls/mshtml/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/mshtml/Makefile" ;;
"dlls/mshtml/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/mshtml/tests/Makefile" ;;
"dlls/msi/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/msi/Makefile" ;;
"dlls/msi/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/msi/tests/Makefile" ;;
"dlls/msimg32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/msimg32/Makefile" ;;
+ "dlls/msimtf/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/msimtf/Makefile" ;;
"dlls/msisys.ocx/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/msisys.ocx/Makefile" ;;
"dlls/msnet32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/msnet32/Makefile" ;;
"dlls/msrle32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/msrle32/Makefile" ;;
+ "dlls/mssip32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/mssip32/Makefile" ;;
+ "dlls/msvcirt/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/msvcirt/Makefile" ;;
+ "dlls/msvcr71/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/msvcr71/Makefile" ;;
"dlls/msvcrt/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/msvcrt/Makefile" ;;
"dlls/msvcrt/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/msvcrt/tests/Makefile" ;;
"dlls/msvcrt20/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/msvcrt20/Makefile" ;;
@@@ -21681,6 -23172,7 +23234,7 @@@
"dlls/ntdll/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/ntdll/Makefile" ;;
"dlls/ntdll/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/ntdll/tests/Makefile" ;;
"dlls/ntdsapi/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/ntdsapi/Makefile" ;;
+ "dlls/ntdsapi/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/ntdsapi/tests/Makefile" ;;
"dlls/ntoskrnl.exe/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/ntoskrnl.exe/Makefile" ;;
"dlls/ntprint/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/ntprint/Makefile" ;;
"dlls/ntprint/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/ntprint/tests/Makefile" ;;
@@@ -21697,15 -23189,23 +23251,23 @@@
"dlls/oledlg/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/oledlg/Makefile" ;;
"dlls/olepro32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/olepro32/Makefile" ;;
"dlls/olesvr32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/olesvr32/Makefile" ;;
+ "dlls/olethk32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/olethk32/Makefile" ;;
"dlls/opengl32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/opengl32/Makefile" ;;
+ "dlls/opengl32/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/opengl32/tests/Makefile" ;;
"dlls/pdh/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/pdh/Makefile" ;;
"dlls/pdh/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/pdh/tests/Makefile" ;;
"dlls/powrprof/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/powrprof/Makefile" ;;
"dlls/printui/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/printui/Makefile" ;;
+ "dlls/propsys/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/propsys/Makefile" ;;
"dlls/psapi/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/psapi/Makefile" ;;
"dlls/psapi/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/psapi/tests/Makefile" ;;
"dlls/pstorec/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/pstorec/Makefile" ;;
"dlls/qcap/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/qcap/Makefile" ;;
+ "dlls/qedit/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/qedit/Makefile" ;;
+ "dlls/qedit/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/qedit/tests/Makefile" ;;
+ "dlls/qmgr/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/qmgr/Makefile" ;;
+ "dlls/qmgr/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/qmgr/tests/Makefile" ;;
+ "dlls/qmgrprxy/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/qmgrprxy/Makefile" ;;
"dlls/quartz/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/quartz/Makefile" ;;
"dlls/quartz/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/quartz/tests/Makefile" ;;
"dlls/query/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/query/Makefile" ;;
@@@ -21714,13 -23214,14 +23276,14 @@@
"dlls/riched20/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/riched20/Makefile" ;;
"dlls/riched20/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/riched20/tests/Makefile" ;;
"dlls/riched32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/riched32/Makefile" ;;
+ "dlls/riched32/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/riched32/tests/Makefile" ;;
"dlls/rpcrt4/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/rpcrt4/Makefile" ;;
"dlls/rpcrt4/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/rpcrt4/tests/Makefile" ;;
"dlls/rsabase/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/rsabase/Makefile" ;;
- "dlls/rsabase/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/rsabase/tests/Makefile" ;;
"dlls/rsaenh/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/rsaenh/Makefile" ;;
"dlls/rsaenh/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/rsaenh/tests/Makefile" ;;
"dlls/sane.ds/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/sane.ds/Makefile" ;;
+ "dlls/sccbase/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/sccbase/Makefile" ;;
"dlls/schannel/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/schannel/Makefile" ;;
"dlls/schannel/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/schannel/tests/Makefile" ;;
"dlls/secur32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/secur32/Makefile" ;;
@@@ -21741,9 -23242,13 +23304,13 @@@
"dlls/shfolder/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/shfolder/Makefile" ;;
"dlls/shlwapi/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/shlwapi/Makefile" ;;
"dlls/shlwapi/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/shlwapi/tests/Makefile" ;;
+ "dlls/slbcsp/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/slbcsp/Makefile" ;;
+ "dlls/slc/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/slc/Makefile" ;;
"dlls/snmpapi/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/snmpapi/Makefile" ;;
"dlls/snmpapi/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/snmpapi/tests/Makefile" ;;
+ "dlls/softpub/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/softpub/Makefile" ;;
"dlls/spoolss/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/spoolss/Makefile" ;;
+ "dlls/spoolss/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/spoolss/tests/Makefile" ;;
"dlls/stdole2.tlb/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/stdole2.tlb/Makefile" ;;
"dlls/stdole32.tlb/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/stdole32.tlb/Makefile" ;;
"dlls/sti/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/sti/Makefile" ;;
@@@ -21759,6 -23264,7 +23326,7 @@@
"dlls/user32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/user32/Makefile" ;;
"dlls/user32/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/user32/tests/Makefile" ;;
"dlls/userenv/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/userenv/Makefile" ;;
+ "dlls/userenv/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/userenv/tests/Makefile" ;;
"dlls/usp10/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/usp10/Makefile" ;;
"dlls/usp10/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/usp10/tests/Makefile" ;;
"dlls/uuid/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/uuid/Makefile" ;;
@@@ -21790,6 -23296,7 +23358,7 @@@
"dlls/winequartz.drv/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/winequartz.drv/Makefile" ;;
"dlls/winex11.drv/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/winex11.drv/Makefile" ;;
"dlls/wing32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/wing32/Makefile" ;;
+ "dlls/winhttp/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/winhttp/Makefile" ;;
"dlls/wininet/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/wininet/Makefile" ;;
"dlls/wininet/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/wininet/tests/Makefile" ;;
"dlls/winmm/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/winmm/Makefile" ;;
@@@ -21802,6 -23309,7 +23371,7 @@@
"dlls/wintrust/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/wintrust/Makefile" ;;
"dlls/wintrust/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/wintrust/tests/Makefile" ;;
"dlls/wldap32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/wldap32/Makefile" ;;
+ "dlls/wmi/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/wmi/Makefile" ;;
"dlls/wnaspi32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/wnaspi32/Makefile" ;;
"dlls/wow32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/wow32/Makefile" ;;
"dlls/ws2_32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/ws2_32/Makefile" ;;
@@@ -21832,12 -23340,16 +23402,16 @@@
"programs/notepad/Makefile") CONFIG_FILES="$CONFIG_FILES programs/notepad/Makefile" ;;
"programs/oleview/Makefile") CONFIG_FILES="$CONFIG_FILES programs/oleview/Makefile" ;;
"programs/progman/Makefile") CONFIG_FILES="$CONFIG_FILES programs/progman/Makefile" ;;
+ "programs/reg/Makefile") CONFIG_FILES="$CONFIG_FILES programs/reg/Makefile" ;;
"programs/regedit/Makefile") CONFIG_FILES="$CONFIG_FILES programs/regedit/Makefile" ;;
"programs/regsvr32/Makefile") CONFIG_FILES="$CONFIG_FILES programs/regsvr32/Makefile" ;;
"programs/rpcss/Makefile") CONFIG_FILES="$CONFIG_FILES programs/rpcss/Makefile" ;;
"programs/rundll32/Makefile") CONFIG_FILES="$CONFIG_FILES programs/rundll32/Makefile" ;;
+ "programs/secedit/Makefile") CONFIG_FILES="$CONFIG_FILES programs/secedit/Makefile" ;;
+ "programs/services/Makefile") CONFIG_FILES="$CONFIG_FILES programs/services/Makefile" ;;
"programs/spoolsv/Makefile") CONFIG_FILES="$CONFIG_FILES programs/spoolsv/Makefile" ;;
"programs/start/Makefile") CONFIG_FILES="$CONFIG_FILES programs/start/Makefile" ;;
+ "programs/svchost/Makefile") CONFIG_FILES="$CONFIG_FILES programs/svchost/Makefile" ;;
"programs/taskmgr/Makefile") CONFIG_FILES="$CONFIG_FILES programs/taskmgr/Makefile" ;;
"programs/uninstaller/Makefile") CONFIG_FILES="$CONFIG_FILES programs/uninstaller/Makefile" ;;
"programs/view/Makefile") CONFIG_FILES="$CONFIG_FILES programs/view/Makefile" ;;
@@@ -21856,6 -23368,7 +23430,7 @@@
"programs/winhelp/Makefile") CONFIG_FILES="$CONFIG_FILES programs/winhelp/Makefile" ;;
"programs/winver/Makefile") CONFIG_FILES="$CONFIG_FILES programs/winver/Makefile" ;;
"programs/wordpad/Makefile") CONFIG_FILES="$CONFIG_FILES programs/wordpad/Makefile" ;;
+ "programs/write/Makefile") CONFIG_FILES="$CONFIG_FILES programs/write/Makefile" ;;
"programs/xcopy/Makefile") CONFIG_FILES="$CONFIG_FILES programs/xcopy/Makefile" ;;
"server/Makefile") CONFIG_FILES="$CONFIG_FILES server/Makefile" ;;
"tools/Makefile") CONFIG_FILES="$CONFIG_FILES tools/Makefile" ;;
@@@ -21969,6 -23482,7 +23544,7 @@@ LIBS!$LIBS$ac_deli
build_alias!$build_alias$ac_delim
host_alias!$host_alias$ac_delim
target_alias!$target_alias$ac_delim
+ MAINTAINER_MODE!$MAINTAINER_MODE$ac_delim
build!$build$ac_delim
build_cpu!$build_cpu$ac_delim
build_vendor!$build_vendor$ac_delim
@@@ -22004,6 -23518,7 +23580,7 @@@ AS!$AS$ac_deli
ac_ct_AS!$ac_ct_AS$ac_delim
LD!$LD$ac_delim
AR!$AR$ac_delim
+ ARFLAGS!$ARFLAGS$ac_delim
RANLIB!$RANLIB$ac_delim
STRIP!$STRIP$ac_delim
WINDRES!$WINDRES$ac_delim
@@@ -22012,8 -23527,6 +23589,6 @@@ LN!$LN$ac_deli
GREP!$GREP$ac_delim
EGREP!$EGREP$ac_delim
LDCONFIG!$LDCONFIG$ac_delim
- INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
- INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 82; then
@@@ -22075,11 -23588,15 +23650,15 @@@ _ACEO
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
+ INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
+ INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
INSTALL_DATA!$INSTALL_DATA$ac_delim
LINT!$LINT$ac_delim
LINTFLAGS!$LINTFLAGS$ac_delim
FONTFORGE!$FONTFORGE$ac_delim
PKG_CONFIG!$PKG_CONFIG$ac_delim
+ RSVG!$RSVG$ac_delim
+ ICOTOOL!$ICOTOOL$ac_delim
PRELINK!$PRELINK$ac_delim
LIBPTHREAD!$LIBPTHREAD$ac_delim
XLIB!$XLIB$ac_delim
@@@ -22100,6 -23617,7 +23679,7 @@@ LDD!$LDD$ac_deli
DLLTOOL!$DLLTOOL$ac_delim
DLLWRAP!$DLLWRAP$ac_delim
MINGWAR!$MINGWAR$ac_delim
+ SECURITYLIB!$SECURITYLIB$ac_delim
COREFOUNDATIONLIB!$COREFOUNDATIONLIB$ac_delim
IOKITLIB!$IOKITLIB$ac_delim
LDEXECFLAGS!$LDEXECFLAGS$ac_delim
@@@ -22121,7 -23639,6 +23701,6 @@@ gphoto2_devel!$gphoto2_devel$ac_deli
gphoto2port_devel!$gphoto2port_devel$ac_delim
GPHOTO2LIBS!$GPHOTO2LIBS$ac_delim
GPHOTO2INCL!$GPHOTO2INCL$ac_delim
- ICULIBS!$ICULIBS$ac_delim
RESOLVLIBS!$RESOLVLIBS$ac_delim
LCMSLIBS!$LCMSLIBS$ac_delim
LDAPLIBS!$LDAPLIBS$ac_delim
@@@ -22134,9 -23651,9 +23713,10 @@@ ESDLIBS!$ESDLIBS$ac_deli
ESDINCL!$ESDINCL$ac_delim
ALSALIBS!$ALSALIBS$ac_delim
AUDIOIOLIBS!$AUDIOIOLIBS$ac_delim
+ FONTCONFIGINCL!$FONTCONFIGINCL$ac_delim
EXTRACFLAGS!$EXTRACFLAGS$ac_delim
BUILTINFLAG!$BUILTINFLAG$ac_delim
+EXECSTACK!$EXECSTACK$ac_delim
LDPATH!$LDPATH$ac_delim
CRTLIBS!$CRTLIBS$ac_delim
SOCKETLIBS!$SOCKETLIBS$ac_delim
@@@ -22149,7 -23666,7 +23729,7 @@@ LIBOBJS!$LIBOBJS$ac_deli
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 72; then
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 76; then
++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 77; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
@@@ -22605,10 -24122,10 +24185,10 @@@ f
ac_save_IFS="$IFS"
IFS="|"
- if test "$verbose" = "yes"; then
+ if test "x$wine_notices != "x; then
+ echo >&6
for msg in $wine_notices; do
if test -n "$msg"; then
- echo >&2
{ echo "$as_me:$LINENO: $msg" >&5
echo "$as_me: $msg" >&6;}
fi
@@@ -22623,7 -24140,7 +24203,7 @@@ echo "$as_me: WARNING: $msg" >&2;
done
IFS="$ac_save_IFS"
- echo
- echo "Configure finished. Do '${ac_make} depend && ${ac_make}' to compile Wine."
- echo
+ echo "
+ $as_me: Finished. Do '${ac_make} depend && ${ac_make}' to compile Wine.
+ " >&6
diff --combined configure.ac
index cdf8849,33562e3..50bba44
--- a/configure.ac
+++ b/configure.ac
@@@ -14,9 -14,68 +14,68 @@@ dnl **** Command-line arguments ***
AC_ARG_ENABLE(win16, AS_HELP_STRING([--disable-win16],[do not include Win16 support]))
AC_ARG_ENABLE(win64, AS_HELP_STRING([--enable-win64],[build a Win64 emulator on AMD64 (won't run Win32 binaries)]))
-
+ AC_ARG_ENABLE(maintainer-mode, AS_HELP_STRING([--enable-maintainer-mode],[enable maintainer-specific build rules]),
+ ,[AC_SUBST([MAINTAINER_MODE],[\#])])
+
+ AC_ARG_WITH(alsa, AS_HELP_STRING([--without-alsa],[do not use the Alsa sound support]),
+ [if test "x$withval" = "xno"; then ac_cv_header_sys_asoundlib_h=no; ac_cv_header_alsa_asoundlib_h=no; fi])
+ AC_ARG_WITH(audioio, AS_HELP_STRING([--without-audioio],[do not use the AudioIO sound support]),
+ [if test "x$withval" = "xno"; then ac_cv_header_libaudioio_h=no; fi])
+ AC_ARG_WITH(capi, AS_HELP_STRING([--without-capi],[do not use CAPI (ISDN support)]),
+ [if test "x$withval" = "xno"; then ac_cv_header_capi20_h=no; ac_cv_header_linux_capi_h=no; fi])
+ AC_ARG_WITH(cms, AS_HELP_STRING([--without-cms],[do not use CMS (color management support)]),
+ [if test "x$withval" = "xno"; then ac_cv_header_lcms_h=no; ac_cv_header_lcms_lcms_h=no; fi])
+ AC_ARG_WITH(coreaudio, AS_HELP_STRING([--without-coreaudio],[do not use the CoreAudio sound support]),
+ [if test "x$withval" = "xno"; then ac_cv_header_CoreAudio_CoreAudio_h=no; fi])
+ AC_ARG_WITH(cups, AS_HELP_STRING([--without-cups],[do not use CUPS]),
+ [if test "x$withval" = "xno"; then ac_cv_header_cups_cups_h=no; fi])
+ AC_ARG_WITH(curses, AS_HELP_STRING([--without-curses],[do not use (n)curses]),
+ [if test "x$withval" = "xno"; then ac_cv_header_ncurses_h=no; ac_cv_header_curses_h=no; fi])
+ AC_ARG_WITH(esd, AS_HELP_STRING([--without-esd],[do not use the EsounD sound support]))
+ AC_ARG_WITH(fontconfig,AS_HELP_STRING([--without-fontconfig],[do not use fontconfig]),
+ [if test "x$withval" = "xno"; then ac_cv_header_fontconfig_fontconfig_h=no; fi])
+ AC_ARG_WITH(gphoto, AS_HELP_STRING([--without-gphoto],[do not use gphoto (Digital Camera support)]))
+ AC_ARG_WITH(glu, AS_HELP_STRING([--without-glu],[do not use the GLU library]),
+ [if test "x$withval" = "xno"; then ac_cv_header_GL_glu_h=no; fi])
+ AC_ARG_WITH(hal, AS_HELP_STRING([--without-hal],[do not use HAL (dynamic device support)]))
+ AC_ARG_WITH(jack, AS_HELP_STRING([--without-jack],[do not use the Jack sound support]),
+ [if test "x$withval" = "xno"; then ac_cv_header_jack_jack_h=no; fi])
+ AC_ARG_WITH(jpeg, AS_HELP_STRING([--without-jpeg],[do not use JPEG]),
+ [if test "x$withval" = "xno"; then ac_cv_header_jpeglib_h=no; fi])
+ AC_ARG_WITH(ldap, AS_HELP_STRING([--without-ldap],[do not use LDAP]),
+ [if test "x$withval" = "xno"; then ac_cv_header_ldap_h=no; ac_cv_header_lber_h=no; fi])
+ AC_ARG_WITH(nas, AS_HELP_STRING([--without-nas],[do not use the NAS sound support]),
+ [if test "x$withval" = "xno"; then ac_cv_header_audio_audiolib_h=no; fi])
AC_ARG_WITH(opengl, AS_HELP_STRING([--without-opengl],[do not use OpenGL]))
- AC_ARG_WITH(wine-tools,AS_HELP_STRING([--with-wine-tools=<dir>],[use Wine tools from directory <dir>]))
+ AC_ARG_WITH(openssl, AS_HELP_STRING([--without-openssl],[do not use OpenSSL]),
+ [if test "x$withval" = "xno"; then ac_cv_header_openssl_err_h=no; ac_cv_header_openssl_ssl_h=no; fi])
+ AC_ARG_WITH(oss, AS_HELP_STRING([--without-oss],[do not use the OSS sound support]),
+ [if test "x$withval" = "xno"; then ac_cv_header_soundcard_h=no; ac_cv_header_sys_soundcard_h=no; ac_cv_header_machine_soundcard_h=no; fi])
+ AC_ARG_WITH(png, AS_HELP_STRING([--without-png],[do not use PNG]),
+ [if test "x$withval" = "xno"; then ac_cv_header_png_h=no; fi])
+ AC_ARG_WITH(sane, AS_HELP_STRING([--without-sane],[do not use SANE (scanner support)]))
+ AC_ARG_WITH(xcomposite,AS_HELP_STRING([--without-xcomposite],[do not use the Xcomposite extension]),
+ [if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_Xcomposite_h=no; fi])
+ AC_ARG_WITH(xcursor, AS_HELP_STRING([--without-xcursor],[do not use the Xcursor extension]),
+ [if test "x$withval" = "xno"; then ac_cv_header_X11_Xcursor_Xcursor_h=no; fi])
+ AC_ARG_WITH(xinerama, AS_HELP_STRING([--without-xinerama],[do not use Xinerama (multi-monitor support)]),
+ [if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_Xinerama_h=no; fi])
+ AC_ARG_WITH(xinput, AS_HELP_STRING([--without-xinput],[do not use the Xinput extension]),
+ [if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_XInput_h=no; fi])
+ AC_ARG_WITH(xml, AS_HELP_STRING([--without-xml],[do not use XML]))
+ AC_ARG_WITH(xrandr, AS_HELP_STRING([--without-xrandr],[do not use Xrandr (resolution changes)]),
+ [if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_Xrandr_h=no; fi])
+ AC_ARG_WITH(xrender, AS_HELP_STRING([--without-xrender],[do not use the Xrender extension]),
+ [if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_Xrender_h=no; fi])
+ AC_ARG_WITH(xshape, AS_HELP_STRING([--without-xshape],[do not use the Xshape extension]),
+ [if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_shape_h=no; fi])
+ AC_ARG_WITH(xshm, AS_HELP_STRING([--without-xshm],[do not use XShm (shared memory extension)]),
+ [if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_XShm_h=no; fi])
+ AC_ARG_WITH(xslt, AS_HELP_STRING([--without-xslt],[do not use XSLT]))
+ AC_ARG_WITH(xvidmode, AS_HELP_STRING([--without-xvidmode],[do not use XFree video mode extension]),
+ [if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_xf86vmode_h=no; fi])
+
+ AC_ARG_WITH(wine-tools,AS_HELP_STRING([--with-wine-tools=DIR],[use Wine tools from directory DIR]))
AC_CANONICAL_HOST
case $host in
@@@ -24,6 -83,7 +83,7 @@@
if test "x$enable_win64" != "xyes"
then
test -n "$CC" || CC="gcc -m32"
+ test -n "$CXX"|| CXX="g++ -m32"
test -n "$LD" || LD="ld -m elf_i386"
test -n "$AS" || AS="as --32"
host_cpu="i386"
@@@ -102,6 -162,7 +162,7 @@@ f
AC_CHECK_TOOLS(AS,[gas as],as)
AC_CHECK_TOOL(LD,ld,ld)
AC_CHECK_TOOL(AR,ar,ar)
+ AC_SUBST(ARFLAGS,rc)
AC_PROG_RANLIB
AC_CHECK_TOOL(STRIP,strip,strip)
AC_CHECK_TOOL(WINDRES,windres,false)
@@@ -129,6 -190,15 +190,15 @@@ AC_SUBST(LINTFLAGS
dnl Check for various programs
AC_CHECK_PROGS(FONTFORGE, fontforge, false)
AC_CHECK_PROGS(PKG_CONFIG, pkg-config, false)
+ AC_CHECK_PROGS(RSVG, rsvg, false)
+ AC_CHECK_PROGS(ICOTOOL, icotool, false)
+
+ if test "${enable_maintainer_mode+set}" = set
+ then
+ if test "$FONTFORGE" = "false"; then WINE_WARNING([fontforge is missing, fonts can't be rebuilt.]); fi
+ if test "$RSVG" = "false"; then WINE_WARNING([rsvg is missing, icons can't be rebuilt.]); fi
+ if test "$ICOTOOL" = "false"; then WINE_WARNING([icotool is missing, icons can't be rebuilt.]); fi
+ fi
case $host_cpu in
*i[[3456789]]86*)
@@@ -142,8 -212,6 +212,6 @@@ dnl Check for -li386 for NetBSD and Ope
AC_CHECK_LIB(i386,i386_set_ldt)
dnl Check for -lossaudio for NetBSD
AC_CHECK_LIB(ossaudio,_oss_ioctl)
- dnl Check for -lxpg4 for FreeBSD
- AC_CHECK_LIB(xpg4,_xpg4_setrunelocale)
dnl Check for -lpthread
AC_CHECK_LIB(pthread,pthread_create,AC_SUBST(LIBPTHREAD,"-lpthread"))
@@@ -264,7 -332,6 +332,6 @@@ AC_CHECK_HEADERS(
sys/wait.h \
syscall.h \
termios.h \
- unicode/ubidi.h \
unistd.h \
utime.h \
valgrind/memcheck.h
@@@ -275,28 -342,31 +342,31 @@@ dnl **** Checks for headers that depen
AC_CHECK_HEADERS([sys/mount.h sys/statfs.h sys/user.h sys/vfs.h],,,
[#include <sys/types.h>
- #if HAVE_SYS_PARAM_H
+ #ifdef HAVE_SYS_PARAM_H
# include <sys/param.h>
#endif])
AC_CHECK_HEADERS([netinet/in_pcb.h netinet/ip_var.h net/if.h net/if_arp.h net/if_dl.h net/if_types.h net/route.h netipx/ipx.h],,,
[#include <sys/types.h>
- #if HAVE_SYS_SOCKET_H
+ #ifdef HAVE_SYS_SOCKET_H
# include <sys/socket.h>
- #endif])
- #if HAVE_SYS_SOCKETVAR_H
+ #endif
+ #ifdef HAVE_SYS_SOCKETVAR_H
# include <sys/socketvar.h>
#endif
+ #ifdef HAVE_NETINET_IN_H
+ # include <netinet/in.h>
+ #endif])
AC_CHECK_HEADERS([netinet/tcp_var.h],,,
[#include <sys/types.h>
- #if HAVE_SYS_SOCKET_H
+ #ifdef HAVE_SYS_SOCKET_H
# include <sys/socket.h>
#endif
- #if HAVE_SYS_SOCKETVAR_H
+ #ifdef HAVE_SYS_SOCKETVAR_H
# include <sys/socketvar.h>
#endif
- #if HAVE_NETINET_IN_H
+ #ifdef HAVE_NETINET_IN_H
# include <netinet/in.h>
#endif
#ifdef HAVE_NETINET_TCP_H
@@@ -308,24 -378,30 +378,30 @@@ AC_CHECK_HEADERS([linux/ipx.h],,
#ifdef HAVE_ASM_TYPES_H
# include <asm/types.h>
#endif
- #if HAVE_SYS_SOCKET_H
+ #ifdef HAVE_SYS_SOCKET_H
# include <sys/socket.h>
#endif])
AC_CHECK_HEADERS([resolv.h],,,
[#include <sys/types.h>
- #if HAVE_SYS_SOCKET_H
+ #ifdef HAVE_SYS_SOCKET_H
# include <sys/socket.h>
#endif
- #if HAVE_NETINET_IN_H
+ #ifdef HAVE_NETINET_IN_H
# include <netinet/in.h>
#endif
- #if HAVE_ARPA_NAMESER_H
+ #ifdef HAVE_ARPA_NAMESER_H
# include <arpa/nameser.h>
#endif])
AC_CHECK_HEADERS(ucontext.h,,,[#include <signal.h>])
+ AC_CHECK_HEADERS([sys/thr.h],,,
+ [#include <sys/types.h>
+ #ifdef HAVE_UCONTEXT_H
+ #include <ucontext.h>
+ #endif])
+
AC_CHECK_HEADERS([pthread_np.h],,,
[#ifdef HAVE_PTHREAD_H
#include <pthread.h>
@@@ -381,6 -457,7 +457,7 @@@ case $host_os i
STRIP="$STRIP -x"
LDRPATH_LOCAL="&& install_name_tool -change @executable_path/\`\$(RELPATH) \$(bindir) \$(libdir)\`/libwine.1.dylib @executable_path/\$(TOPOBJDIR)/libs/wine/libwine.1.dylib \$@ || \$(RM) \$@"
dnl declare needed frameworks
+ AC_SUBST(SECURITYLIB,"-framework Security -framework CoreFoundation")
AC_SUBST(COREFOUNDATIONLIB,"-framework CoreFoundation")
AC_SUBST(IOKITLIB,"-framework IOKit -framework CoreFoundation")
AC_SUBST(LDEXECFLAGS,["-image_base 0x7bf00000 -Wl,-segaddr,WINE_DOS,0x00000000,-segaddr,WINE_SHARED_HEAP,0x7f000000"])
@@@ -441,6 -518,9 +518,9 @@@
[LDRPATH_INSTALL="-Wl,-R,\\\$\$ORIGIN/\`\$(RELPATH) \$(bindir) \$(libdir)\`"
LDRPATH_LOCAL="-Wl,-R,\\\$\$ORIGIN/\$(TOPOBJDIR)/libs/wine"])])
+ WINE_TRY_CFLAGS([-Wl,--enable-new-dtags],
+ [LDRPATH_INSTALL="$LDRPATH_INSTALL -Wl,--enable-new-dtags"])
+
case $host_cpu in
*i[[3456789]]86* | x86_64)
WINE_TRY_CFLAGS([-Wl,--section-start,.interp=0x7bf00400],
@@@ -511,6 -591,7 +591,7 @@@ the
X11/extensions/shape.h \
X11/extensions/XInput.h \
X11/extensions/XShm.h \
+ X11/extensions/Xcomposite.h \
X11/extensions/Xinerama.h \
X11/extensions/Xrandr.h \
X11/extensions/Xrender.h \
@@@ -535,12 -616,16 +616,16 @@@
then
WINE_CHECK_SONAME(Xcursor,XcursorImageLoadCursor,,,[$X_LIBS -lXext -lX11 $X_EXTRA_LIBS])
fi
+ WINE_NOTICE_WITH(xcursor,[test "x$ac_cv_lib_soname_Xcursor" = "x"],
+ [libxcursor development files not found, the Xcursor extension won't be supported.])
dnl *** Check for X input extension
if test "$ac_cv_header_X11_extensions_XInput_h" = "yes"
then
WINE_CHECK_SONAME(Xi,XOpenDevice,,,[$X_LIBS -lXext -lX11 $X_EXTRA_LIBS])
fi
+ WINE_NOTICE_WITH(xinput,[test "x$ac_cv_lib_soname_Xi" = "x"],
+ [libxi development files not found, the Xinput extension won't be supported.])
dnl *** Check for X Shm extension
if test "$ac_cv_header_X11_extensions_XShm_h" = "yes"
@@@ -549,8 -634,8 +634,8 @@@
AC_DEFINE(HAVE_LIBXXSHM, 1, [Define if you have the X Shm extension]),,
$X_LIBS -lXext -lX11 $X_EXTRA_LIBS)
fi
- WINE_NOTICE_IF([test "$ac_cv_lib_Xext_XShmQueryExtension" != "yes"],[XShm development files not found.
- Wine will be built without XShm support. (winex11.drv)])
+ WINE_NOTICE_WITH(xshm,[test "$ac_cv_lib_Xext_XShmQueryExtension" != "yes"],
+ [XShm development files not found, X Shared Memory won't be supported.])
dnl *** Check for X shape extension
if test "$ac_cv_header_X11_extensions_shape_h" = "yes"
@@@ -559,8 -644,8 +644,8 @@@
AC_DEFINE(HAVE_LIBXSHAPE, 1, [Define if you have the X Shape extension]),,
$X_LIBS -lXext -lX11 $X_EXTRA_LIBS)
fi
- WINE_NOTICE_IF([test "$ac_cv_lib_Xext_XShapeQueryExtension" != "yes"],[XShape development files not found.
- Wine will be built without XShape support. (winex11.drv)])
+ WINE_NOTICE_WITH(xshape,[test "$ac_cv_lib_Xext_XShapeQueryExtension" != "yes"],
+ [XShape development files not found, XShape won't be supported.])
dnl *** Check for XFree86 VMODE extension
if test "$ac_cv_header_X11_extensions_xf86vmode_h" = "yes"
@@@ -571,8 -656,8 +656,8 @@@
],,
$X_LIBS -lXext -lX11 $X_EXTRA_LIBS)
fi
- WINE_NOTICE_IF([test "$ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension" != "yes"],[Xxf86vm development files not found.
- Wine will be built without XF86 Vidmode support. (winex11.drv)])
+ WINE_NOTICE_WITH(xvidmode,[test "$ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension" != "yes"],
+ [libXxf86vm development files not found, XFree86 Vidmode won't be supported.])
dnl *** Check for Transform functions in Xrender
if test "$ac_cv_header_X11_extensions_Xrender_h" = "yes" -a "x$ac_cv_lib_soname_X11" != "x" -a "x$ac_cv_lib_soname_Xext" != "x"
@@@ -584,8 -669,8 +669,8 @@@
[$X_LIBS -lXext -lX11 $X_EXTRA_LIBS])],,[$X_LIBS -lXext -lX11 $X_EXTRA_LIBS])
fi
- WINE_NOTICE_IF([test "x$ac_cv_lib_soname_Xrender" = "x"],[XRender development files not found.
- Wine will be built without XRender support. (winex11.drv)])
+ WINE_NOTICE_WITH(xrender,[test "x$ac_cv_lib_soname_Xrender" = "x"],
+ [libxrender development files not found, XRender won't be supported.])
dnl *** Check for X RandR extension
if test "$ac_cv_header_X11_extensions_Xrandr_h" = "yes" -a "x$ac_cv_lib_soname_Xrender" != "x"
@@@ -594,8 -679,8 +679,8 @@@
#include <X11/extensions/Xrandr.h>]], [[static typeof(XRRSetScreenConfigAndRate) * func;]])],
[WINE_CHECK_SONAME(Xrandr,XRRQueryExtension,,,[$X_LIBS -lXext -lX11 $X_EXTRA_LIBS])])
fi
- WINE_NOTICE_IF([test "x$ac_cv_lib_soname_Xrandr" = "x"],[XRandr development files not found.
- Wine will be built without XRandr support. (winex11.drv)])
+ WINE_NOTICE_WITH(xrandr,[test "x$ac_cv_lib_soname_Xrandr" = "x"],
+ [libxrandr development files not found, XRandr won't be supported.])
dnl *** Check for Xinerama extension
if test "$ac_cv_header_X11_extensions_Xinerama_h" = "yes"
@@@ -604,12 -689,27 +689,27 @@@
#include <X11/extensions/Xinerama.h>]], [[static typeof(XineramaQueryScreens) * func;]])],
[WINE_CHECK_SONAME(Xinerama,XineramaQueryScreens,,,[$X_LIBS -lXext -lX11 $X_EXTRA_LIBS])])
fi
- WINE_NOTICE_IF([test "x$ac_cv_lib_soname_Xinerama" = "x"],[Xinerama development files not found.
- Wine will be built without Xinerama support. (winex11.drv)])
+ WINE_NOTICE_WITH(xinerama,[test "x$ac_cv_lib_soname_Xinerama" = "x"],
+ [libxinerama development files not found, multi-monitor setups won't be supported.])
+
+ dnl *** Check for X Composite extension
+ if test "$ac_cv_header_X11_extensions_Xcomposite_h" = "yes"
+ then
+ WINE_CHECK_SONAME(Xcomposite,XCompositeRedirectWindow,,,[$X_LIBS -lXext -lX11 $X_EXTRA_LIBS])
+ fi
+ WINE_NOTICE_WITH(xcomposite,[test "x$ac_cv_lib_soname_Xcomposite" = "x"],
+ [libxcomposite development files not found, Xcomposite won't be supported.])
+
+ dnl *** Check for XICCallback struct
+ AC_CHECK_MEMBERS([XICCallback.callback],,,
+ [#ifdef HAVE_X11_XLIB_H
+ #include <X11/Xlib.h>
+ #endif])
dnl *** End of X11/Xlib.h check
dnl Check for the presence of OpenGL
+ opengl_msg=""
if test "x$with_opengl" != "xno"
then
AC_CHECK_HEADERS(GL/gl.h GL/glx.h GL/glext.h GL/glu.h,,,
@@@ -631,31 -731,35 +731,35 @@@
[OPENGL_LIBS="-lGL"
OPENGLFILES='$(OPENGLFILES)'
AC_DEFINE(HAVE_OPENGL, 1, [Define if OpenGL is present on the system])],
- [if test -f /usr/X11R6/lib/libGL.a
- then
- WINE_WARNING([/usr/X11R6/lib/libGL.a is present on your system.
- This probably prevents linking to OpenGL. Try deleting the file and restarting configure.])
- else
- WINE_WARNING([No OpenGL library found on this system.
- Wine will be build without OpenGL or Direct3D support.])
- fi],
+ [WINE_CHECK_SONAME(GL,glXCreateContext,
+ [OPENGL_LIBS="-Xlinker -dylib_file -Xlinker /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib -lGL"
+ OPENGLFILES='$(OPENGLFILES)'
+ AC_DEFINE(HAVE_OPENGL, 1, [Define if OpenGL is present on the system])],
+ [if test -f /usr/X11R6/lib/libGL.a
+ then
+ opengl_msg="/usr/X11R6/lib/libGL.a is present on your system.
+ This probably prevents linking to OpenGL. Try deleting the file and restarting configure."
+ else
+ opengl_msg="No OpenGL library found on this system."
+ fi],
+ $X_LIBS -lXext -lX11 -lm $X_EXTRA_LIBS -dylib_file /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib)],
$X_LIBS -lXext -lX11 -lm $X_EXTRA_LIBS)
-
- dnl Check for GLU32 library.
- AC_CHECK_LIB(GLU,gluLookAt,
- [OPENGL_LIBS="$OPENGL_LIBS -lGLU"
- GLU32FILES='$(GLU32FILES)']
- ,,
- $OPENGL_LIBS $X_LIBS $X_PRE_LIBS -lXext -lX11 -lm $X_EXTRA_LIBS)
+ if test "$ac_cv_header_GL_glu_h" = "yes"
+ then
+ WINE_CHECK_SONAME(GLU,gluLookAt,[GLU32FILES='$(GLU32FILES)'],,
+ [$OPENGL_LIBS $X_LIBS $X_PRE_LIBS -lXext -lX11 -lm $X_EXTRA_LIBS])
+ fi
+ WINE_NOTICE_WITH(glu,[test "x$ac_cv_lib_soname_GLU" = "x"],
+ [libGLU development files not found, GLU won't be supported.])
else
- WINE_WARNING([Old Mesa headers detected. Consider upgrading your Mesa libraries (http://www.mesa3d.org/).
- Wine will be build without OpenGL or Direct3D support.])
+ opengl_msg="Old Mesa headers detected. Consider upgrading your Mesa libraries."
fi
else
- WINE_WARNING([OpenGL development headers not found.
- Wine will be build without OpenGL or Direct3D support.])
+ opengl_msg="OpenGL development headers not found."
fi
fi
+ WINE_WARNING_WITH(opengl,[test -n "$opengl_msg"],[$opengl_msg
+ OpenGL and Direct3D won't be supported.])
dnl **** Check for NAS ****
AC_SUBST(NASLIBS,"")
@@@ -676,10 -780,10 +780,10 @@@ els
XLIB=""
X_CFLAGS=""
X_LIBS=""
- WINE_WARNING([X development files not found. Wine will be built
+ fi
+ WINE_WARNING_WITH(x,[test "x$XLIB" = "x"],[X development files not found. Wine will be built
without X support, which probably isn't what you want. You will need to install
development packages of Xlib/Xfree86 at the very least.])
- fi
dnl **** Check for libxml2 ****
@@@ -687,55 -791,68 +791,68 @@@ AC_SUBST(XML2LIBS,""
AC_SUBST(XML2INCL,"")
AC_SUBST(XSLTLIBS,"")
AC_SUBST(XSLTINCL,"")
- ac_save_CPPFLAGS="$CPPFLAGS"
- if test "$PKG_CONFIG" != "false"
+ if test "x$with_xml" != "xno"
then
- ac_xml_libs="`$PKG_CONFIG --libs libxml-2.0 2>/dev/null`"
- ac_xml_cflags="`$PKG_CONFIG --cflags libxml-2.0 2>/dev/null`"
- else
- ac_xml_libs="`xml2-config --libs 2>/dev/null`"
- ac_xml_cflags="`xml2-config --cflags 2>/dev/null`"
+ ac_save_CPPFLAGS="$CPPFLAGS"
+ if test "$PKG_CONFIG" != "false"
+ then
+ ac_xml_libs="`$PKG_CONFIG --libs libxml-2.0 2>/dev/null`"
+ ac_xml_cflags="`$PKG_CONFIG --cflags libxml-2.0 2>/dev/null`"
+ else
+ ac_xml_libs="`xml2-config --libs 2>/dev/null`"
+ ac_xml_cflags="`xml2-config --cflags 2>/dev/null`"
+ fi
+ CPPFLAGS="$CPPFLAGS $ac_xml_cflags"
+ AC_CHECK_HEADERS(libxml/parser.h,
+ [AC_CHECK_LIB(xml2, xmlParseMemory,
+ [AC_DEFINE(HAVE_LIBXML2, 1, [Define if you have the libxml2 library])
+ XML2LIBS="$ac_xml_libs"
+ XML2INCL="$ac_xml_cflags"],,$ac_xml_libs)
+ AC_CHECK_LIB(xml2, xmlReadMemory,
+ [AC_DEFINE(HAVE_XMLREADMEMORY,1,[Define if libxml2 has the xmlReadMemory function])],,$ac_xml_libs)
+ AC_CHECK_LIB(xml2, xmlNewDocPI,
+ [AC_DEFINE(HAVE_XMLNEWDOCPI,1,[Define if libxml2 has the xmlNewDocPI function])],,$ac_xml_libs)
+ ])
+ CPPFLAGS="$ac_save_CPPFLAGS"
fi
- CPPFLAGS="$CPPFLAGS $ac_xml_cflags"
- AC_CHECK_HEADERS(libxml/parser.h,
- [AC_CHECK_LIB(xml2, xmlParseMemory,
- [AC_DEFINE(HAVE_LIBXML2, 1, [Define if you have the libxml2 library])
- XML2LIBS="$ac_xml_libs"
- XML2INCL="$ac_xml_cflags"],,$ac_xml_libs)
- AC_CHECK_LIB(xml2, xmlReadMemory,
- [AC_DEFINE(HAVE_XMLREADMEMORY,1,[Define if libxml2 has the xmlReadMemory function])],,$ac_xml_libs)
- AC_CHECK_LIB(xml2, xmlNewDocPI,
- [AC_DEFINE(HAVE_XMLNEWDOCPI,1,[Define if libxml2 has the xmlNewDocPI function])],,$ac_xml_libs)
- ])
- CPPFLAGS="$ac_save_CPPFLAGS"
- WINE_NOTICE_IF([test "$ac_cv_lib_xml2_xmlParseMemory" != "yes"],[libxml2 development files not found.
- Wine will be built without XML support. (msxml.dll)])
-
- if test "$PKG_CONFIG" != "false"
+ WINE_NOTICE_WITH(xml,[test "$ac_cv_lib_xml2_xmlParseMemory" != "yes"],
+ [libxml2 development files not found, XML won't be supported.])
+
+ if test "x$with_xslt" != "xno"
then
- ac_xslt_libs="`$PKG_CONFIG --libs libxslt 2>/dev/null`"
- ac_xslt_cflags="`$PKG_CONFIG --cflags libxslt 2>/dev/null`"
- else
- ac_xslt_libs="`xslt-config --libs 2>/dev/null`"
- ac_xslt_cflags="`xslt-config --cflags 2>/dev/null`"
- fi
- CPPFLAGS="$CPPFLAGS $ac_xslt_cflags"
- AC_CHECK_HEADERS([libxslt/pattern.h libxslt/transform.h],
- [AC_CHECK_LIB(xslt, xsltCompilePattern,
- [AC_DEFINE(HAVE_LIBXSLT, 1, [Define if you have the libxslt library])
- XSLTLIBS="$ac_xslt_libs"
- XSLTINCL="$ac_xslt_cflags"],,$ac_xslt_libs)
- ],,
- [#ifdef HAVE_LIBXSLT_PATTERN_H
+ if test "$PKG_CONFIG" != "false"
+ then
+ ac_xslt_libs="`$PKG_CONFIG --libs libxslt 2>/dev/null`"
+ ac_xslt_cflags="`$PKG_CONFIG --cflags libxslt 2>/dev/null`"
+ else
+ ac_xslt_libs="`xslt-config --libs 2>/dev/null`"
+ ac_xslt_cflags="`xslt-config --cflags 2>/dev/null`"
+ fi
+ ac_save_CPPFLAGS="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS $ac_xslt_cflags"
+ AC_CHECK_HEADERS([libxslt/pattern.h libxslt/transform.h],,,
+ [#ifdef HAVE_LIBXSLT_PATTERN_H
# include <libxslt/pattern.h>
#endif])
- CPPFLAGS="$ac_save_CPPFLAGS"
- WINE_NOTICE_IF([test "$ac_cv_lib_xslt_xsltCompilePattern" != "yes"],[libxslt development files not found.
- Wine will be built without xslt support. (msxml.dll)])
+ CPPFLAGS="$ac_save_CPPFLAGS"
+ if test "$ac_cv_header_libxslt_transform_h" = "yes"
+ then
+ AC_CHECK_LIB(xslt, xsltCompilePattern,
+ [AC_DEFINE(HAVE_LIBXSLT, 1, [Define if you have the libxslt library])
+ XSLTLIBS="$ac_xslt_libs"
+ XSLTINCL="$ac_xslt_cflags"
+ ac_save_LIBS="$LIBS"
+ LIBS="$LIBS $ac_xslt_libs"
+ AC_CHECK_FUNCS(xsltInit)
+ LIBS="$ac_save_LIBS"],,$ac_xslt_libs)
+ fi
+ fi
+ WINE_NOTICE_WITH(xslt,[test "$ac_cv_lib_xslt_xsltCompilePattern" != "yes"],
+ [libxslt development files not found, xslt won't be supported.])
dnl **** Check for libhal ****
AC_SUBST(HALINCL,"")
- if test "$PKG_CONFIG" != "false"
+ if test "x$with_hal" != "xno" -a "$PKG_CONFIG" != "false"
then
ac_save_CPPFLAGS="$CPPFLAGS"
ac_hal_libs="`$PKG_CONFIG --libs hal 2>/dev/null`"
@@@ -750,8 -867,8 +867,8 @@@
fi
CPPFLAGS="$ac_save_CPPFLAGS"
fi
- WINE_NOTICE_IF([test "x$ac_cv_lib_soname_hal" = "x"],[libhal development files not found.
- Wine will be built without dynamic device support. (explorer.exe)])
+ WINE_NOTICE_WITH(hal,[test "x$ac_cv_lib_soname_hal" = "x"],
+ [libhal development files not found, no dynamic device support.])
dnl **** Check which curses lib to use ***
CURSESLIBS=""
@@@ -766,12 -883,12 +883,12 @@@ ac_save_LIBS="$LIBS
LIBS="$LIBS $CURSESLIBS"
AC_CHECK_FUNCS(mousemask)
LIBS="$ac_save_LIBS"
- WINE_NOTICE_IF([test "x$ac_cv_lib_soname_curses$ac_cv_lib_soname_ncurses" = "x"],[lib(n)curses development files not found.
- Wine will be built without (n)curses support. (wineconsole.exe)])
+ WINE_NOTICE_WITH(curses,[test "x$ac_cv_lib_soname_curses$ac_cv_lib_soname_ncurses" = "x"],
+ [lib(n)curses development files not found, curses won't be supported.])
dnl **** Check for SANE ****
AC_CHECK_PROG(sane_devel,sane-config,sane-config,no)
- if test "$sane_devel" != "no"
+ if test "$sane_devel" != "no" -a "x$with_sane" != "xno"
then
ac_sane_incl="`$sane_devel --cflags`"
ac_save_CPPFLAGS="$CPPFLAGS"
@@@ -780,13 -897,13 +897,13 @@@
[WINE_CHECK_SONAME(sane,sane_init,[AC_SUBST(SANEINCL,"$ac_sane_incl")])])
CPPFLAGS="$ac_save_CPPFLAGS"
fi
- WINE_NOTICE_IF([test "x$ac_cv_lib_soname_sane" = "x"],[libsane development files not found.
- Wine will be built without scanner support. (sane.ds/twain_32.dll)])
+ WINE_NOTICE_WITH(sane,[test "x$ac_cv_lib_soname_sane" = "x"],
+ [libsane development files not found, scanners won't be supported.])
dnl **** Check for libgphoto2 ****
AC_CHECK_PROG(gphoto2_devel,gphoto2-config,gphoto2-config,no)
AC_CHECK_PROG(gphoto2port_devel,gphoto2-port-config,gphoto2-port-config,no)
- if test "$gphoto2_devel" != "no" -a "$gphoto2port_devel" != "no"
+ if test "$gphoto2_devel" != "no" -a "$gphoto2port_devel" != "no" -a "x$with_gphoto" != "xno"
then
ac_gphoto2_incl="`$gphoto2_devel --cflags` `$gphoto2port_devel --cflags`"
ac_gphoto2_libs=""
@@@ -807,29 -924,9 +924,9 @@@
[$GPHOTO2LIBS])])
CPPFLAGS="$ac_save_CPPFLAGS"
fi
- WINE_NOTICE_IF([test "$ac_cv_lib_gphoto2_gp_camera_new" != "yes"],[libgphoto2 development files not found.
- Wine will be built without Digital Camera support. (gphoto2.ds/twain_32.dll)])
-
+ WINE_NOTICE_WITH(gphoto,[test "$ac_cv_lib_gphoto2_gp_camera_new" != "yes"],
+ [libgphoto2 development files not found, digital cameras won't be supported.])
- dnl **** Check for the ICU library ****
- if test "$ac_cv_header_unicode_ubidi_h" = "yes"
- then
- saved_libs="$LIBS"
- icu_libs="-lsicuuc -lsicudata -lstdc++ -lgcc_s"
- if test -n "$ICU_LIB_DIR"
- then
- icu_libs="-L$ICU_LIB_DIR $icu_libs"
- fi
- AC_MSG_CHECKING(whether can link with ICU libraries)
- LIBS="$saved_libs $icu_libs"
- AC_RUN_IFELSE([AC_LANG_PROGRAM([[#include <unicode/ubidi.h>]],[[ubidi_open()]])],
- [AC_DEFINE(HAVE_ICU,1,[Define to 1 if the ICU libraries are installed])
- AC_SUBST(ICULIBS,"$icu_libs")
- AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)],[AC_MSG_RESULT(no)])
- LIBS="$saved_libs"
- fi
- WINE_NOTICE_IF([test "x$ICULIBS" = "x"],[libicu development files not found.
- Wine will be built without bidi (Right to Left) support. (gdi32.dll)])
dnl **** Check for resolver library ***
AC_SUBST(RESOLVLIBS,"")
@@@ -848,8 -945,8 +945,8 @@@ the
[AC_DEFINE(HAVE_LCMS, 1, [Define if you have the LittleCMS development environment])
LCMSLIBS="-llcms"])
fi
- WINE_NOTICE_IF([test "$ac_cv_lib_lcms_cmsOpenProfileFromFile" != "yes"],[liblcms development files not found.
- Wine will be built without Color Management support. (mscms.dll)])
+ WINE_NOTICE_WITH(cms,[test "$ac_cv_lib_lcms_cmsOpenProfileFromFile" != "yes"],
+ [liblcms development files not found, Color Management won't be supported.])
dnl **** Check for OpenLDAP ***
AC_SUBST(LDAPLIBS,"")
@@@ -865,11 -962,15 +962,15 @@@ the
ldap_count_references \
ldap_first_reference \
ldap_next_reference \
- ldap_parse_reference,
+ ldap_parse_reference \
+ ldap_parse_sort_control \
+ ldap_parse_sortresponse_control \
+ ldap_parse_vlv_control \
+ ldap_parse_vlvresponse_control,
[$LDAPLIBS $LIBPTHREAD])
fi
- WINE_NOTICE_IF([test "x$LDAPLIBS" = "x"],[libldap (OpenLDAP) development files not found.
- Wine will be built without LDAP support. (wldap32.dll)])
+ WINE_NOTICE_WITH(ldap,[test "x$LDAPLIBS" = "x"],
+ [libldap (OpenLDAP) development files not found, LDAP won't be supported.])
dnl **** Check for FreeType 2 ****
AC_CHECK_PROGS(ft_devel,[freetype-config freetype2-config],false)
@@@ -885,6 -986,7 +986,7 @@@ the
AC_CHECK_HEADERS(ft2build.h \
freetype/freetype.h \
freetype/ftglyph.h \
+ freetype/fttypes.h \
freetype/tttables.h \
freetype/ftnames.h \
freetype/ftsnames.h \
@@@ -893,8 -995,8 +995,8 @@@
freetype/ftwinfnt.h \
freetype/ftmodapi.h \
freetype/internal/sfnt.h,,,
- [#if HAVE_FT2BUILD_H
- #include <ft2build.h>
+ [#ifdef HAVE_FT2BUILD_H
+ # include <ft2build.h>
#endif])
AC_PREPROC_IFELSE([AC_LANG_SOURCE([[#include <ft2build.h>
#include <freetype/fttrigon.h>]])],[AC_DEFINE(HAVE_FREETYPE_FTTRIGON_H, 1,
@@@ -916,12 -1018,8 +1018,8 @@@
fi
fi
- dnl Only build the fonts dir if we have both freetype and fontforge
- if test "$FONTFORGE" = "false"
- then
- WINE_WARNING([FontForge is missing.
- Fonts will not be built. Dialog text may be invisible or unaligned.])
- elif test "x$FREETYPELIBS" = "x"
+ dnl Only build the fonts dir if we have freetype
+ if test "x$FREETYPELIBS" = "x"
then
WINE_WARNING([FreeType development files not found.
Fonts will not be built. Dialog text may be invisible or unaligned.])
@@@ -981,7 -1079,7 +1079,7 @@@ WINE_CHECK_LIB_FUNCS(
dnl **** Check for EsounD ****
AC_PATH_PROG(ESDCONFIG, esd-config)
- if test x$ESDCONFIG != x -a x$ESDCONFIG != x'"$ESDCONFIG"';
+ if test "x$with_esd" != xno -a "x$ESDCONFIG" != x -a "x$ESDCONFIG" != x'"$ESDCONFIG"';
then
ESD_CFLAGS=""
for i in `$ESDCONFIG --cflags`
@@@ -1029,16 -1127,16 +1127,16 @@@ if test "$ac_cv_header_capi20_h" = "yes
then
WINE_CHECK_SONAME(capi20,capi20_register)
fi
- WINE_NOTICE_IF([test "x$ac_cv_lib_soname_capi20" = "x"],[libcapi20 development files not found.
- Wine will be built without ISDN support. (capi2032.dll)])
+ WINE_NOTICE_WITH(capi,[test "x$ac_cv_lib_soname_capi20" = "x"],
+ [libcapi20 development files not found, ISDN won't be supported.])
dnl **** Check for cups ****
if test "$ac_cv_header_cups_cups_h" = "yes"
then
WINE_CHECK_SONAME(cups,cupsGetDefault)
fi
- WINE_NOTICE_IF([test "x$ac_cv_lib_soname_cups" = "x"],[libcups development files not found.
- Wine will be built without CUPS support.])
+ WINE_NOTICE_WITH(cups,[test "x$ac_cv_lib_soname_cups" = "x"],
+ [libcups development files not found, CUPS won't be supported.])
dnl **** Check for jack ****
if test "$ac_cv_header_jack_jack_h" = "yes"
@@@ -1050,9 -1148,22 +1148,22 @@@ dnl **** Check for fontconfig ***
if test "$ac_cv_header_fontconfig_fontconfig_h" = "yes"
then
WINE_CHECK_SONAME(fontconfig,FcInit)
+ elif test -n "$X_CFLAGS" -a "x$with_fontconfig" != "xno"
+ then
+ dnl fontconfig is in the X directory on Mac OS X
+ ac_save_CPPFLAGS="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS $X_CFLAGS"
+ $as_unset ac_cv_header_fontconfig_fontconfig_h
+ AC_CHECK_HEADERS([fontconfig/fontconfig.h])
+ CPPFLAGS="$ac_save_CPPFLAGS"
+ if test "$ac_cv_header_fontconfig_fontconfig_h" = "yes"
+ then
+ AC_SUBST(FONTCONFIGINCL,"$X_CFLAGS")
+ WINE_CHECK_SONAME(fontconfig,FcInit,,,[$X_LIBS])
+ fi
fi
- WINE_NOTICE_IF([test "x$ac_cv_lib_soname_fontconfig" = "x"],[fontconfig development files not found.
- Wine will be built without fontconfig support.])
+ WINE_NOTICE_WITH(fontconfig,[test "x$ac_cv_lib_soname_fontconfig" = "x"],
+ [fontconfig development files not found, fontconfig won't be supported.])
dnl **** Check for SSL ****
if test "$ac_cv_header_openssl_err_h" = "yes" -a "$ac_cv_header_openssl_ssl_h" = "yes"
@@@ -1060,31 -1171,37 +1171,37 @@@ the
WINE_CHECK_SONAME(ssl,SSL_library_init)
WINE_CHECK_SONAME(crypto,BIO_new_socket)
fi
- WINE_NOTICE_IF([test "x$ac_cv_lib_soname_ssl" = "x"],[OpenSSL development files not found.
- Wine will be built without SSL support. (wininet.dll)])
+ WINE_NOTICE_WITH(openssl,[test "x$ac_cv_lib_soname_ssl" = "x"],
+ [OpenSSL development files not found, SSL won't be supported.])
dnl **** Check for libjpeg ****
if test "$ac_cv_header_jpeglib_h" = "yes"
then
WINE_CHECK_SONAME(jpeg,jpeg_start_decompress)
fi
- WINE_NOTICE_IF([test "x$ac_cv_lib_soname_jpeg" = "x"],[libjpeg development files not found.
- Wine will be built without JPEG support. (oleaut32.dll)])
+ WINE_NOTICE_WITH(jpeg,[test "x$ac_cv_lib_soname_jpeg" = "x"],
+ [libjpeg development files not found, JPEG won't be supported.])
dnl **** Check for libpng ****
if test "$ac_cv_header_png_h" = "yes"
then
WINE_CHECK_SONAME(png,png_create_read_struct,,,,[[libpng[[0-9]]*]])
fi
- WINE_NOTICE_IF([test "x$ac_cv_lib_soname_png" = "x"],[libpng development files not found.
- Wine will be built without PNG support. (oleaut32.dll)])
+ WINE_NOTICE_WITH(png,[test "x$ac_cv_lib_soname_png" = "x"],
+ [libpng development files not found, PNG won't be supported.])
+
+ dnl **** Check for libodbc ****
+ WINE_CHECK_SONAME(odbc,SQLConnect,,[AC_DEFINE_UNQUOTED(SONAME_LIBODBC,["libodbc.$LIBEXT"])])
dnl **** Check for any sound system ****
- WINE_WARNING_IF([test "x$ALSALIBS$AUDIOIOLIBS$COREAUDIO$NASLIBS$ESD_LIBS$ac_cv_lib_soname_jack" = "x" -a \
- "$ac_cv_header_sys_soundcard_h" != "yes" -a \
- "$ac_cv_header_machine_soundcard_h" != "yes" -a \
- "$ac_cv_header_soundcard_h" != "yes"],
- [No sound system was found. Windows applications will be silent.])
+ if test "x$ALSALIBS$AUDIOIOLIBS$COREAUDIO$NASLIBS$ESD_LIBS$ac_cv_lib_soname_jack" = "x" -a \
+ "$ac_cv_header_sys_soundcard_h" != "yes" -a \
+ "$ac_cv_header_machine_soundcard_h" != "yes" -a \
+ "$ac_cv_header_soundcard_h" != "yes" -a \
+ "x$with_alsa$with_audioio$with_coreaudio$with_nas$with_esd$with_jack$with_oss" != xnonononononono
+ then
+ WINE_WARNING([No sound system was found. Windows applications will be silent.])
+ fi
dnl **** Check for gcc specific options ****
@@@ -1117,6 -1234,7 +1234,7 @@@ the
WINE_TRY_CFLAGS([-fno-strict-aliasing])
WINE_TRY_CFLAGS([-Wdeclaration-after-statement])
WINE_TRY_CFLAGS([-Wwrite-strings])
+ WINE_TRY_CFLAGS([-Wtype-limits])
dnl Check for noisy string.h
saved_CFLAGS="$CFLAGS"
@@@ -1141,18 -1259,6 +1259,18 @@@
fi
fi
+AC_SUBST(EXECSTACK,"")
+saved_LDFLAGS="$LDFLAGS"
+LDFLAGS="$LDFLAGS -z execstack"
+AC_CACHE_CHECK([for -z execstack], ac_cv_z_execstack,
+ AC_TRY_LINK([],[int main(void) {return 0;}],
+ ac_cv_z_execstack=yes,ac_cv_z_execstack=no))
+if test $ac_cv_z_execstack
+then
+ EXECSTACK="-z execstack"
+fi
+LDFLAGS="$saved_LDFLAGS"
+
dnl **** Check how to define a function in assembly code ****
AC_CACHE_CHECK([how to define a function in assembly code], ac_cv_asm_func_def,
@@@ -1228,6 -1334,9 +1346,9 @@@ case $host_cpu i
linux* | k*bsd*-gnu)
AC_SUBST(MAIN_BINARY,"wine-glibc")
AC_SUBST(EXTRA_BINARIES,"wine-kthread wine-pthread wine-preloader") ;;
+ freebsd*)
+ AC_SUBST(MAIN_BINARY,"wine-freebsd")
+ AC_SUBST(EXTRA_BINARIES,"wine-pthread") ;;
esac
;;
esac
@@@ -1239,8 -1348,11 +1360,11 @@@ AC_CHECK_FUNCS(
_popen \
_snprintf \
_spawnvp \
+ _strdup \
_stricmp \
_strnicmp \
+ _strtoi64 \
+ _strtoui64 \
_vsnprintf \
asctime_r \
chsize \
@@@ -1278,6 -1390,7 +1402,7 @@@
rfork \
sched_yield \
select \
+ setproctitle \
setrlimit \
settimeofday \
sigaltstack \
@@@ -1287,10 -1400,14 +1412,14 @@@
statfs \
statvfs \
strcasecmp \
+ strdup \
strerror \
strncasecmp \
strtold \
+ strtoll \
+ strtoull \
tcgetattr \
+ thr_kill2 \
timegm \
usleep \
vsnprintf \
@@@ -1356,13 -1473,13 +1485,13 @@@ f
AC_CACHE_CHECK([whether we can use re-entrant gethostbyname_r Linux style],
wine_cv_linux_gethostbyname_r_6,
AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <netdb.h>]],[[
- char *name=NULL;
+ char *name=0;
struct hostent he;
struct hostent *result;
- char *buf=NULL;
+ char *buf=0;
int bufsize=0;
int res,errnr;
- char *addr=NULL;
+ char *addr=0;
int addrlen=0;
int addrtype=0;
res=gethostbyname_r(name,&he,buf,bufsize,&result,&errnr);
@@@ -1492,6 -1609,14 +1621,14 @@@ the
AC_DEFINE(HAVE_DAYLIGHT, 1, [Define if you have the daylight variable])
fi
+ dnl Check for isinf
+ AC_CACHE_CHECK([for isinf], ac_cv_have_isinf,
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <math.h>]], [[float f = 0.0; isinf(f)]])],[ac_cv_have_isinf="yes"],[ac_cv_have_isinf="no"]))
+ if test "$ac_cv_have_isinf" = "yes"
+ then
+ AC_DEFINE(HAVE_ISINF, 1, [Define to 1 if you have the `isinf' function.])
+ fi
+
dnl *** check for the need to define platform-specific symbols
case $host_cpu in
@@@ -1519,6 -1644,7 +1656,7 @@@ Makefile: dummy\
\\
\$(OBJS): \$(IDL_GEN_HEADERS)\\
\$(IDL_GEN_C_SRCS:.c=.o): \$(IDL_GEN_C_SRCS)\\
+ \$(RC_SRCS:.rc=.res): \$(IDL_TLB_SRCS:.idl=.tlb)\\
\$(LEX_SRCS:.l=.yy.o): \$(LEX_SRCS:.l=.yy.c)\\
\$(BISON_SRCS:.y=.tab.o): \$(BISON_SRCS:.y=.tab.c)"],
["### Dependencies:
@@@ -1530,6 -1656,7 +1668,7 @@@ Makefile: dumm
\$(OBJS): \$(IDL_GEN_HEADERS)
\$(IDL_GEN_C_SRCS:.c=.o): \$(IDL_GEN_C_SRCS)
+ \$(RC_SRCS:.rc=.res): \$(IDL_TLB_SRCS:.idl=.tlb)
\$(LEX_SRCS:.l=.yy.o): \$(LEX_SRCS:.l=.yy.c)
\$(BISON_SRCS:.y=.tab.o): \$(BISON_SRCS:.y=.tab.c)"]))
@@@ -1568,6 -1695,8 +1707,8 @@@ AC_CONFIG_FILES([Makefile]
AC_CONFIG_FILES([dlls/Makefile])
AC_CONFIG_FILES([dlls/acledit/Makefile])
AC_CONFIG_FILES([dlls/activeds/Makefile])
+ AC_CONFIG_FILES([dlls/actxprxy/Makefile])
+ AC_CONFIG_FILES([dlls/adsiid/Makefile])
AC_CONFIG_FILES([dlls/advapi32/Makefile])
AC_CONFIG_FILES([dlls/advapi32/tests/Makefile])
AC_CONFIG_FILES([dlls/advpack/Makefile])
@@@ -1592,11 -1721,16 +1733,16 @@@ AC_CONFIG_FILES([dlls/comdlg32/Makefile
AC_CONFIG_FILES([dlls/comdlg32/tests/Makefile])
AC_CONFIG_FILES([dlls/compstui/Makefile])
AC_CONFIG_FILES([dlls/credui/Makefile])
+ AC_CONFIG_FILES([dlls/credui/tests/Makefile])
AC_CONFIG_FILES([dlls/crtdll/Makefile])
AC_CONFIG_FILES([dlls/crypt32/Makefile])
AC_CONFIG_FILES([dlls/crypt32/tests/Makefile])
+ AC_CONFIG_FILES([dlls/cryptdlg/Makefile])
AC_CONFIG_FILES([dlls/cryptdll/Makefile])
AC_CONFIG_FILES([dlls/cryptnet/Makefile])
+ AC_CONFIG_FILES([dlls/cryptnet/tests/Makefile])
+ AC_CONFIG_FILES([dlls/cryptui/Makefile])
+ AC_CONFIG_FILES([dlls/ctapi32/Makefile])
AC_CONFIG_FILES([dlls/ctl3d32/Makefile])
AC_CONFIG_FILES([dlls/d3d10/Makefile])
AC_CONFIG_FILES([dlls/d3d8/Makefile])
@@@ -1607,6 -1741,22 +1753,22 @@@ AC_CONFIG_FILES([dlls/d3dim/Makefile]
AC_CONFIG_FILES([dlls/d3drm/Makefile])
AC_CONFIG_FILES([dlls/d3drm/tests/Makefile])
AC_CONFIG_FILES([dlls/d3dx8/Makefile])
+ AC_CONFIG_FILES([dlls/d3dx8/tests/Makefile])
+ AC_CONFIG_FILES([dlls/d3dx9_24/Makefile])
+ AC_CONFIG_FILES([dlls/d3dx9_25/Makefile])
+ AC_CONFIG_FILES([dlls/d3dx9_26/Makefile])
+ AC_CONFIG_FILES([dlls/d3dx9_27/Makefile])
+ AC_CONFIG_FILES([dlls/d3dx9_28/Makefile])
+ AC_CONFIG_FILES([dlls/d3dx9_29/Makefile])
+ AC_CONFIG_FILES([dlls/d3dx9_30/Makefile])
+ AC_CONFIG_FILES([dlls/d3dx9_31/Makefile])
+ AC_CONFIG_FILES([dlls/d3dx9_32/Makefile])
+ AC_CONFIG_FILES([dlls/d3dx9_33/Makefile])
+ AC_CONFIG_FILES([dlls/d3dx9_34/Makefile])
+ AC_CONFIG_FILES([dlls/d3dx9_35/Makefile])
+ AC_CONFIG_FILES([dlls/d3dx9_36/Makefile])
+ AC_CONFIG_FILES([dlls/d3dx9_36/tests/Makefile])
+ AC_CONFIG_FILES([dlls/d3dx9_37/Makefile])
AC_CONFIG_FILES([dlls/d3dxof/Makefile])
AC_CONFIG_FILES([dlls/dbghelp/Makefile])
AC_CONFIG_FILES([dlls/dciman32/Makefile])
@@@ -1634,20 -1784,26 +1796,26 @@@ AC_CONFIG_FILES([dlls/dplayx/tests/Make
AC_CONFIG_FILES([dlls/dpnaddr/Makefile])
AC_CONFIG_FILES([dlls/dpnet/Makefile])
AC_CONFIG_FILES([dlls/dpnhpast/Makefile])
+ AC_CONFIG_FILES([dlls/dpnlobby/Makefile])
AC_CONFIG_FILES([dlls/dsound/Makefile])
AC_CONFIG_FILES([dlls/dsound/tests/Makefile])
+ AC_CONFIG_FILES([dlls/dssenh/Makefile])
AC_CONFIG_FILES([dlls/dswave/Makefile])
AC_CONFIG_FILES([dlls/dwmapi/Makefile])
AC_CONFIG_FILES([dlls/dxdiagn/Makefile])
AC_CONFIG_FILES([dlls/dxerr8/Makefile])
AC_CONFIG_FILES([dlls/dxerr9/Makefile])
AC_CONFIG_FILES([dlls/dxguid/Makefile])
+ AC_CONFIG_FILES([dlls/faultrep/Makefile])
+ AC_CONFIG_FILES([dlls/fusion/Makefile])
+ AC_CONFIG_FILES([dlls/fusion/tests/Makefile])
AC_CONFIG_FILES([dlls/gdi32/Makefile])
AC_CONFIG_FILES([dlls/gdi32/tests/Makefile])
AC_CONFIG_FILES([dlls/gdiplus/Makefile])
AC_CONFIG_FILES([dlls/gdiplus/tests/Makefile])
AC_CONFIG_FILES([dlls/glu32/Makefile])
AC_CONFIG_FILES([dlls/gphoto2.ds/Makefile])
+ AC_CONFIG_FILES([dlls/gpkcsp/Makefile])
AC_CONFIG_FILES([dlls/hal/Makefile])
AC_CONFIG_FILES([dlls/hhctrl.ocx/Makefile])
AC_CONFIG_FILES([dlls/hid/Makefile])
@@@ -1660,13 -1816,21 +1828,21 @@@ AC_CONFIG_FILES([dlls/ifsmgr.vxd/Makefi
AC_CONFIG_FILES([dlls/imaadp32.acm/Makefile])
AC_CONFIG_FILES([dlls/imagehlp/Makefile])
AC_CONFIG_FILES([dlls/imm32/Makefile])
+ AC_CONFIG_FILES([dlls/imm32/tests/Makefile])
+ AC_CONFIG_FILES([dlls/inetcomm/Makefile])
+ AC_CONFIG_FILES([dlls/inetcomm/tests/Makefile])
AC_CONFIG_FILES([dlls/infosoft/Makefile])
AC_CONFIG_FILES([dlls/infosoft/tests/Makefile])
+ AC_CONFIG_FILES([dlls/initpki/Makefile])
+ AC_CONFIG_FILES([dlls/inkobj/Makefile])
AC_CONFIG_FILES([dlls/inseng/Makefile])
AC_CONFIG_FILES([dlls/iphlpapi/Makefile])
AC_CONFIG_FILES([dlls/iphlpapi/tests/Makefile])
+ AC_CONFIG_FILES([dlls/itircl/Makefile])
AC_CONFIG_FILES([dlls/itss/Makefile])
AC_CONFIG_FILES([dlls/itss/tests/Makefile])
+ AC_CONFIG_FILES([dlls/jscript/Makefile])
+ AC_CONFIG_FILES([dlls/jscript/tests/Makefile])
AC_CONFIG_FILES([dlls/kernel32/Makefile])
AC_CONFIG_FILES([dlls/kernel32/tests/Makefile])
AC_CONFIG_FILES([dlls/localspl/Makefile])
@@@ -1686,26 -1850,33 +1862,33 @@@ AC_CONFIG_FILES([dlls/mlang/Makefile]
AC_CONFIG_FILES([dlls/mlang/tests/Makefile])
AC_CONFIG_FILES([dlls/mmdevldr.vxd/Makefile])
AC_CONFIG_FILES([dlls/monodebg.vxd/Makefile])
+ AC_CONFIG_FILES([dlls/mountmgr.sys/Makefile])
AC_CONFIG_FILES([dlls/mpr/Makefile])
AC_CONFIG_FILES([dlls/mprapi/Makefile])
AC_CONFIG_FILES([dlls/msacm32.drv/Makefile])
AC_CONFIG_FILES([dlls/msacm32/Makefile])
AC_CONFIG_FILES([dlls/msacm32/tests/Makefile])
AC_CONFIG_FILES([dlls/msadp32.acm/Makefile])
+ AC_CONFIG_FILES([dlls/mscat32/Makefile])
AC_CONFIG_FILES([dlls/mscms/Makefile])
AC_CONFIG_FILES([dlls/mscms/tests/Makefile])
AC_CONFIG_FILES([dlls/mscoree/Makefile])
AC_CONFIG_FILES([dlls/msdmo/Makefile])
AC_CONFIG_FILES([dlls/msftedit/Makefile])
AC_CONFIG_FILES([dlls/msg711.acm/Makefile])
+ AC_CONFIG_FILES([dlls/mshtml.tlb/Makefile])
AC_CONFIG_FILES([dlls/mshtml/Makefile])
AC_CONFIG_FILES([dlls/mshtml/tests/Makefile])
AC_CONFIG_FILES([dlls/msi/Makefile])
AC_CONFIG_FILES([dlls/msi/tests/Makefile])
AC_CONFIG_FILES([dlls/msimg32/Makefile])
+ AC_CONFIG_FILES([dlls/msimtf/Makefile])
AC_CONFIG_FILES([dlls/msisys.ocx/Makefile])
AC_CONFIG_FILES([dlls/msnet32/Makefile])
AC_CONFIG_FILES([dlls/msrle32/Makefile])
+ AC_CONFIG_FILES([dlls/mssip32/Makefile])
+ AC_CONFIG_FILES([dlls/msvcirt/Makefile])
+ AC_CONFIG_FILES([dlls/msvcr71/Makefile])
AC_CONFIG_FILES([dlls/msvcrt/Makefile])
AC_CONFIG_FILES([dlls/msvcrt/tests/Makefile])
AC_CONFIG_FILES([dlls/msvcrt20/Makefile])
@@@ -1724,6 -1895,7 +1907,7 @@@ AC_CONFIG_FILES([dlls/newdev/Makefile]
AC_CONFIG_FILES([dlls/ntdll/Makefile])
AC_CONFIG_FILES([dlls/ntdll/tests/Makefile])
AC_CONFIG_FILES([dlls/ntdsapi/Makefile])
+ AC_CONFIG_FILES([dlls/ntdsapi/tests/Makefile])
AC_CONFIG_FILES([dlls/ntoskrnl.exe/Makefile])
AC_CONFIG_FILES([dlls/ntprint/Makefile])
AC_CONFIG_FILES([dlls/ntprint/tests/Makefile])
@@@ -1740,15 -1912,23 +1924,23 @@@ AC_CONFIG_FILES([dlls/olecli32/Makefile
AC_CONFIG_FILES([dlls/oledlg/Makefile])
AC_CONFIG_FILES([dlls/olepro32/Makefile])
AC_CONFIG_FILES([dlls/olesvr32/Makefile])
+ AC_CONFIG_FILES([dlls/olethk32/Makefile])
AC_CONFIG_FILES([dlls/opengl32/Makefile])
+ AC_CONFIG_FILES([dlls/opengl32/tests/Makefile])
AC_CONFIG_FILES([dlls/pdh/Makefile])
AC_CONFIG_FILES([dlls/pdh/tests/Makefile])
AC_CONFIG_FILES([dlls/powrprof/Makefile])
AC_CONFIG_FILES([dlls/printui/Makefile])
+ AC_CONFIG_FILES([dlls/propsys/Makefile])
AC_CONFIG_FILES([dlls/psapi/Makefile])
AC_CONFIG_FILES([dlls/psapi/tests/Makefile])
AC_CONFIG_FILES([dlls/pstorec/Makefile])
AC_CONFIG_FILES([dlls/qcap/Makefile])
+ AC_CONFIG_FILES([dlls/qedit/Makefile])
+ AC_CONFIG_FILES([dlls/qedit/tests/Makefile])
+ AC_CONFIG_FILES([dlls/qmgr/Makefile])
+ AC_CONFIG_FILES([dlls/qmgr/tests/Makefile])
+ AC_CONFIG_FILES([dlls/qmgrprxy/Makefile])
AC_CONFIG_FILES([dlls/quartz/Makefile])
AC_CONFIG_FILES([dlls/quartz/tests/Makefile])
AC_CONFIG_FILES([dlls/query/Makefile])
@@@ -1757,13 -1937,14 +1949,14 @@@ AC_CONFIG_FILES([dlls/resutils/Makefile
AC_CONFIG_FILES([dlls/riched20/Makefile])
AC_CONFIG_FILES([dlls/riched20/tests/Makefile])
AC_CONFIG_FILES([dlls/riched32/Makefile])
+ AC_CONFIG_FILES([dlls/riched32/tests/Makefile])
AC_CONFIG_FILES([dlls/rpcrt4/Makefile])
AC_CONFIG_FILES([dlls/rpcrt4/tests/Makefile])
AC_CONFIG_FILES([dlls/rsabase/Makefile])
- AC_CONFIG_FILES([dlls/rsabase/tests/Makefile])
AC_CONFIG_FILES([dlls/rsaenh/Makefile])
AC_CONFIG_FILES([dlls/rsaenh/tests/Makefile])
AC_CONFIG_FILES([dlls/sane.ds/Makefile])
+ AC_CONFIG_FILES([dlls/sccbase/Makefile])
AC_CONFIG_FILES([dlls/schannel/Makefile])
AC_CONFIG_FILES([dlls/schannel/tests/Makefile])
AC_CONFIG_FILES([dlls/secur32/Makefile])
@@@ -1784,9 -1965,13 +1977,13 @@@ AC_CONFIG_FILES([dlls/shell32/tests/Mak
AC_CONFIG_FILES([dlls/shfolder/Makefile])
AC_CONFIG_FILES([dlls/shlwapi/Makefile])
AC_CONFIG_FILES([dlls/shlwapi/tests/Makefile])
+ AC_CONFIG_FILES([dlls/slbcsp/Makefile])
+ AC_CONFIG_FILES([dlls/slc/Makefile])
AC_CONFIG_FILES([dlls/snmpapi/Makefile])
AC_CONFIG_FILES([dlls/snmpapi/tests/Makefile])
+ AC_CONFIG_FILES([dlls/softpub/Makefile])
AC_CONFIG_FILES([dlls/spoolss/Makefile])
+ AC_CONFIG_FILES([dlls/spoolss/tests/Makefile])
AC_CONFIG_FILES([dlls/stdole2.tlb/Makefile])
AC_CONFIG_FILES([dlls/stdole32.tlb/Makefile])
AC_CONFIG_FILES([dlls/sti/Makefile])
@@@ -1802,6 -1987,7 +1999,7 @@@ AC_CONFIG_FILES([dlls/urlmon/tests/Make
AC_CONFIG_FILES([dlls/user32/Makefile])
AC_CONFIG_FILES([dlls/user32/tests/Makefile])
AC_CONFIG_FILES([dlls/userenv/Makefile])
+ AC_CONFIG_FILES([dlls/userenv/tests/Makefile])
AC_CONFIG_FILES([dlls/usp10/Makefile])
AC_CONFIG_FILES([dlls/usp10/tests/Makefile])
AC_CONFIG_FILES([dlls/uuid/Makefile])
@@@ -1833,6 -2019,7 +2031,7 @@@ AC_CONFIG_FILES([dlls/wineps.drv/Makefi
AC_CONFIG_FILES([dlls/winequartz.drv/Makefile])
AC_CONFIG_FILES([dlls/winex11.drv/Makefile])
AC_CONFIG_FILES([dlls/wing32/Makefile])
+ AC_CONFIG_FILES([dlls/winhttp/Makefile])
AC_CONFIG_FILES([dlls/wininet/Makefile])
AC_CONFIG_FILES([dlls/wininet/tests/Makefile])
AC_CONFIG_FILES([dlls/winmm/Makefile])
@@@ -1845,6 -2032,7 +2044,7 @@@ AC_CONFIG_FILES([dlls/wintab32/Makefile
AC_CONFIG_FILES([dlls/wintrust/Makefile])
AC_CONFIG_FILES([dlls/wintrust/tests/Makefile])
AC_CONFIG_FILES([dlls/wldap32/Makefile])
+ AC_CONFIG_FILES([dlls/wmi/Makefile])
AC_CONFIG_FILES([dlls/wnaspi32/Makefile])
AC_CONFIG_FILES([dlls/wow32/Makefile])
AC_CONFIG_FILES([dlls/ws2_32/Makefile])
@@@ -1875,12 -2063,16 +2075,16 @@@ AC_CONFIG_FILES([programs/net/Makefile]
AC_CONFIG_FILES([programs/notepad/Makefile])
AC_CONFIG_FILES([programs/oleview/Makefile])
AC_CONFIG_FILES([programs/progman/Makefile])
+ AC_CONFIG_FILES([programs/reg/Makefile])
AC_CONFIG_FILES([programs/regedit/Makefile])
AC_CONFIG_FILES([programs/regsvr32/Makefile])
AC_CONFIG_FILES([programs/rpcss/Makefile])
AC_CONFIG_FILES([programs/rundll32/Makefile])
+ AC_CONFIG_FILES([programs/secedit/Makefile])
+ AC_CONFIG_FILES([programs/services/Makefile])
AC_CONFIG_FILES([programs/spoolsv/Makefile])
AC_CONFIG_FILES([programs/start/Makefile])
+ AC_CONFIG_FILES([programs/svchost/Makefile])
AC_CONFIG_FILES([programs/taskmgr/Makefile])
AC_CONFIG_FILES([programs/uninstaller/Makefile])
AC_CONFIG_FILES([programs/view/Makefile])
@@@ -1899,6 -2091,7 +2103,7 @@@ AC_CONFIG_FILES([programs/winevdm/Makef
AC_CONFIG_FILES([programs/winhelp/Makefile])
AC_CONFIG_FILES([programs/winver/Makefile])
AC_CONFIG_FILES([programs/wordpad/Makefile])
+ AC_CONFIG_FILES([programs/write/Makefile])
AC_CONFIG_FILES([programs/xcopy/Makefile])
AC_CONFIG_FILES([server/Makefile])
AC_CONFIG_FILES([tools/Makefile])
@@@ -1918,9 -2111,9 +2123,9 @@@ f
WINE_PRINT_MESSAGES
- echo
- echo "Configure finished. Do '${ac_make} depend && ${ac_make}' to compile Wine."
- echo
+ echo "
+ $as_me: Finished. Do '${ac_make} depend && ${ac_make}' to compile Wine.
+ " >&AS_MESSAGE_FD
dnl Local Variables:
dnl comment-start: "dnl "
--
Debian Wine packaging
More information about the pkg-wine-party
mailing list