Module: wine
Branch: refs/heads/master
Commit: d42002b72c1218a8e46c3df2582ee05b4e8fe412
URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d42002b72c1218a8e46c3df…
Author: Benjamin Arai <me(a)benjaminarai.com>
Date: Mon Jul 17 11:30:58 2006 -0700
oleaut32: VarCmp - Corrected function description.
---
dlls/oleaut32/variant.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c
index 3080e53..2de8550 100644
--- a/dlls/oleaut32/variant.c
+++ b/dlls/oleaut32/variant.c
@@ -2615,7 +2615,7 @@ static HRESULT _VarChangeTypeExWrap (VAR
* RETURNS
* VARCMP_LT: left variant is less than right variant.
* VARCMP_EQ: input variants are equal.
- * VARCMP_LT: left variant is greater than right variant.
+ * VARCMP_GT: left variant is greater than right variant.
* VARCMP_NULL: either one of the input variants is NULL.
* Failure: An HRESULT error code indicating the error.
*
Module: wine
Branch: refs/heads/master
Commit: 3d08f5d9146a2ceb849da8179708a491a6d8b55d
URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3d08f5d9146a2ceb849da81…
Author: Alexandre Julliard <julliard(a)winehq.org>
Date: Tue Jul 18 10:12:20 2006 +0200
configure: Store the full path to the prelink tool.
---
configure | 30 ++++++++++++++----------------
configure.ac | 2 +-
2 files changed, 15 insertions(+), 17 deletions(-)
diff --git a/configure b/configure
index a03a85c..bf2f3c7 100755
--- a/configure
+++ b/configure
@@ -6884,26 +6884,26 @@ test -n "$PKG_CONFIG" || PKG_CONFIG="fal
case $host_cpu in
*i[3456789]86*)
- for ac_prog in prelink
-do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
+ # Extract the first word of "prelink", so it can be a program name with args.
+set dummy prelink; 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_PRELINK+set}" = set; then
+if test "${ac_cv_path_PRELINK+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- if test -n "$PRELINK"; then
- ac_cv_prog_PRELINK="$PRELINK" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ case $PRELINK in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_PRELINK="$PRELINK" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in /sbin /usr/sbin $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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_PRELINK="$ac_prog"
+ ac_cv_path_PRELINK="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
@@ -6911,9 +6911,11 @@ done
done
IFS=$as_save_IFS
+ test -z "$ac_cv_path_PRELINK" && ac_cv_path_PRELINK="false"
+ ;;
+esac
fi
-fi
-PRELINK=$ac_cv_prog_PRELINK
+PRELINK=$ac_cv_path_PRELINK
if test -n "$PRELINK"; then
{ echo "$as_me:$LINENO: result: $PRELINK" >&5
echo "${ECHO_T}$PRELINK" >&6; }
@@ -6923,10 +6925,6 @@ echo "${ECHO_T}no" >&6; }
fi
- test -n "$PRELINK" && break
-done
-test -n "$PRELINK" || PRELINK="false"
-
;;
esac
diff --git a/configure.ac b/configure.ac
index 7894a57..861ed21 100644
--- a/configure.ac
+++ b/configure.ac
@@ -126,7 +126,7 @@ AC_CHECK_PROGS(PKG_CONFIG, pkg-config, f
case $host_cpu in
*i[[3456789]]86*)
- AC_CHECK_PROGS(PRELINK, prelink, false, [/sbin /usr/sbin $PATH])
+ AC_PATH_PROG(PRELINK, prelink, false, [/sbin /usr/sbin $PATH])
;;
esac