[pkg-wine-party] [SCM] Debian Wine packaging branch, master, updated. wine-0.9.60-752-gdf0b499
Ove Kaaven
ovek at arcticnet.no
Fri May 2 21:37:17 UTC 2008
The following commit has been merged in the master branch:
commit df0b499d289fdcee28b78d4570a22d763c3c7b19
Merge: 39a2bc7212182762636d70005caad86155f8f3fe 4611de86ad308adf6175b8d199afab90031a84ee
Author: Ove Kaaven <ovek at arcticnet.no>
Date: Fri May 2 22:04:14 2008 +0200
New upstream release 0.9.61, released May 2, 2008.
- Automatic updating of the WINEPREFIX directory.
- Winhelp now uses Richedit as display engine.
- Many RichEdit fixes.
- More improvements to IME support.
- More quartz fixes.
- Implementation for many more Gdiplus functions.
- Lots of bug fixes.
diff --combined configure
index f95a26f,c105665..6345759
--- 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.60.
+ # Generated by GNU Autoconf 2.61 for Wine 0.9.61.
#
# 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.60'
- PACKAGE_STRING='Wine 0.9.60'
+ PACKAGE_VERSION='0.9.61'
+ PACKAGE_STRING='Wine 0.9.61'
PACKAGE_BUGREPORT='wine-devel at winehq.org'
ac_unique_file="server/atom.c"
@@@ -763,7 -763,6 +763,7 @@@ AUDIOIOLIB
FONTCONFIGINCL
EXTRACFLAGS
BUILTINFLAG
+EXECSTACK
LDPATH
CRTLIBS
SOCKETLIBS
@@@ -1294,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.60 to adapt to many kinds of systems.
+ \`configure' configures Wine 0.9.61 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@@ -1363,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.60:";;
+ short | recursive ) echo "Configuration of Wine 0.9.61:";;
esac
cat <<\_ACEOF
@@@ -1389,6 -1388,7 +1389,7 @@@ Optional Packages
--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
@@@ -1490,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.60
+ Wine configure 0.9.61
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@@ -1504,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.60, which was
+ It was created by Wine $as_me 0.9.61, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@@ -1973,6 -1973,12 +1974,12 @@@ if test "${with_gphoto+set}" = set; the
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;
@@@ -8850,6 -8856,130 +8857,6 @@@ if test $ac_cv_cflags__fPIC__Wl___expor
fi
- as_ac_var=`echo "ac_cv_cflags_-fPIC -Wl,--rpath,\$ORIGIN/../lib" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking whether the compiler supports -fPIC -Wl,--rpath,\$ORIGIN/../lib" >&5
-echo $ECHO_N "checking whether the compiler supports -fPIC -Wl,--rpath,\$ORIGIN/../lib... $ECHO_C" >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_wine_try_cflags_saved=$CFLAGS
-CFLAGS="$CFLAGS -fPIC -Wl,--rpath,\$ORIGIN/../lib"
-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
- 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
-CFLAGS=$ac_wine_try_cflags_saved
-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
- LDRPATH_INSTALL="-Wl,--rpath,\\\$\$ORIGIN/\`\$(RELPATH) \$(bindir) \$(libdir)\`"
- LDRPATH_LOCAL="-Wl,--rpath,\\\$\$ORIGIN/\$(TOPOBJDIR)/libs/wine"
-else
- as_ac_var=`echo "ac_cv_cflags_-fPIC -Wl,-R,\$ORIGIN/../lib" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking whether the compiler supports -fPIC -Wl,-R,\$ORIGIN/../lib" >&5
-echo $ECHO_N "checking whether the compiler supports -fPIC -Wl,-R,\$ORIGIN/../lib... $ECHO_C" >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_wine_try_cflags_saved=$CFLAGS
-CFLAGS="$CFLAGS -fPIC -Wl,-R,\$ORIGIN/../lib"
-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
- 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
-CFLAGS=$ac_wine_try_cflags_saved
-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
- LDRPATH_INSTALL="-Wl,-R,\\\$\$ORIGIN/\`\$(RELPATH) \$(bindir) \$(libdir)\`"
- LDRPATH_LOCAL="-Wl,-R,\\\$\$ORIGIN/\$(TOPOBJDIR)/libs/wine"
-fi
-
-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
@@@ -10966,15 -11096,16 +10973,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
@@@ -11014,24 -11145,48 +11022,48 @@@ 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
@@@ -16445,67 -16600,6 +16477,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; }
@@@ -21171,6 -21265,66 +21203,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
@@@ -21374,6 -21528,7 +21466,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)"
@@@ -22014,6 -22169,8 +22107,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"
@@@ -22637,7 -22794,7 +22732,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.60, which was
+ This file was extended by Wine $as_me 0.9.61, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@@ -22690,7 -22847,7 +22785,7 @@@ Report bugs to <bug-autoconf at gnu.org>.
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
- Wine config.status 0.9.60
+ Wine config.status 0.9.61
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
@@@ -23107,6 -23264,7 +23202,7 @@@ d
"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" ;;
@@@ -23496,7 -23654,6 +23592,7 @@@ AUDIOIOLIBS!$AUDIOIOLIBS$ac_deli
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
@@@ -23509,7 -23666,7 +23605,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` = 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
diff --combined configure.ac
index a4731f2,33562e3..5053e6f
--- a/configure.ac
+++ b/configure.ac
@@@ -35,6 -35,8 +35,8 @@@ AC_ARG_WITH(esd, AS_HELP_STRING([
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])
@@@ -509,6 -511,13 +511,6 @@@ case $host_os i
WINE_TRY_CFLAGS([-fPIC -Wl,--export-dynamic],
[AC_SUBST(LDEXECFLAGS,["-Wl,--export-dynamic"])])
- WINE_TRY_CFLAGS([-fPIC -Wl,--rpath,\$ORIGIN/../lib],
- [LDRPATH_INSTALL="-Wl,--rpath,\\\$\$ORIGIN/\`\$(RELPATH) \$(bindir) \$(libdir)\`"
- LDRPATH_LOCAL="-Wl,--rpath,\\\$\$ORIGIN/\$(TOPOBJDIR)/libs/wine"],
- [WINE_TRY_CFLAGS([-fPIC -Wl,-R,\$ORIGIN/../lib],
- [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"])
@@@ -735,13 -744,13 +737,13 @@@ This probably prevents linking to OpenG
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
opengl_msg="Old Mesa headers detected. Consider upgrading your Mesa libraries."
fi
@@@ -1250,18 -1259,6 +1252,18 @@@ the
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,
@@@ -1612,6 -1609,14 +1614,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
@@@ -1639,6 -1644,7 +1649,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:
@@@ -1650,6 -1656,7 +1661,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)"]))
@@@ -1980,6 -1987,7 +1992,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])
diff --combined dlls/winex11.drv/xfont.c
index a443c4a,6d8ff78..bb8f940
--- a/dlls/winex11.drv/xfont.c
+++ b/dlls/winex11.drv/xfont.c
@@@ -51,7 -51,7 +51,7 @@@ WINE_DEFAULT_DEBUG_CHANNEL(font)
#define X_PFONT_MAGIC (0xFADE0000)
#define X_FMC_MAGIC (0x0000CAFE)
-#define MAX_FONTS 1024*16
+#define MAX_FONTS 1024*32
#define MAX_LFD_LENGTH 256
#define TILDE '~'
#define HYPHEN '-'
@@@ -1015,7 -1015,7 +1015,7 @@@ static BOOL LFD_ComposeLFD( const fontO
aLFD.charset_encoding = any;
break;
- case 255: /* no suffix - it ends eg "-ascii" */
+ case 255: /* no suffix - it ends, e.g., "-ascii" */
aLFD.charset_encoding = NULL;
break;
}
@@@ -1366,7 -1366,6 +1366,6 @@@ static void XFONT_WindowsNames(void
for( fr = fontList; fr ; fr = fr->next )
{
fontResource* pfr;
- char* lpch;
if( fr->fr_flags & FR_NAMESET ) continue; /* skip already assigned */
@@@ -1377,7 -1376,6 +1376,6 @@@
break;
}
- lpch = fr->lfFaceName;
snprintf( fr->lfFaceName, sizeof(fr->lfFaceName), "%s %s",
/* prepend vendor name */
(pfr==fr) ? "" : fr->resource->foundry,
@@@ -1715,7 -1713,7 +1713,7 @@@ static LPCSTR XFONT_UnAlias(char* font
XFONT_InitialCapitals(font); /* to remove extra white space */
for( fa = aliasTable; fa; fa = fa->next )
- /* use case insensitive matching to handle eg "MS Sans Serif" */
+ /* use case insensitive matching to handle, e.g., "MS Sans Serif" */
if( !strcasecmp( fa->faAlias, font ) )
{
TRACE("found alias '%s'->%s'\n", font, fa->faTypeFace );
--
Debian Wine packaging
More information about the pkg-wine-party
mailing list