From dc9542bf0d3b20987f36e81b36f5fd595e4e3fa1 Mon Sep 17 00:00:00 2001
From: hobbs2 <hobbs2>
Date: Fri, 22 Feb 2008 20:12:27 +0000
Subject: 	* winrc.m4: correct RC_DEPARG definition for !gcc case.

---
 ChangeLog | 2 ++
 winrc.m4  | 7 ++-----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6e9c935..2ed52d6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2008-02-22  Jeff Hobbs  <jeffh@ActiveState.com>
 
+	* winrc.m4: correct RC_DEPARG definition for !gcc case.
+
 	* generic/tkTreeNotify.c (Percents_ItemDelete, ExpandItemList)
 	(Percents_ItemVisibility, Percents_Selection): remove TclFormatInt
 	* generic/qebind.c (QE_ExpandNumber):          references and add
diff --git a/winrc.m4 b/winrc.m4
index 39dd55c..8148ebe 100644
--- a/winrc.m4
+++ b/winrc.m4
@@ -2,6 +2,7 @@
 AC_DEFUN([TREECTRL_PROG_RC], [
 
 #    AC_MSG_CHECKING([for windows resource compiler])
+    RC_DEPARG='"$<"'
     if test "${GCC}" = "yes" ; then
 	AC_CHECK_PROG(RC, windres, windres)
 	if test "${RC}" = "" ; then
@@ -11,7 +12,6 @@ AC_DEFUN([TREECTRL_PROG_RC], [
 	RC_TYPE=
 	RC_INCLUDE=--include
 	RC_DEFINE=--define
-	RC_DEPARG='"$<"'
 	RES=res.o
 
 	# Check for a bug in gcc's windres that causes the
@@ -21,9 +21,7 @@ AC_DEFUN([TREECTRL_PROG_RC], [
 	# with both. Avoid the bug by passing a POSIX
 	# path when using the Cygwin toolchain.
 
-	if test "$ac_cv_cygwin" = "yes"; then
-	    RC_DEPARG='"$<"'
-	elif test "$CYGPATH" != "echo" ; then
+	if test "$ac_cv_cygwin" != "yes" -a "$CYGPATH" != "echo" ; then
 	    conftest=/tmp/conftest.rc
 	    echo "STRINGTABLE BEGIN" > $conftest
 	    echo "101 \"name\"" >> $conftest
@@ -53,7 +51,6 @@ AC_DEFUN([TREECTRL_PROG_RC], [
 	RC_TYPE=-r
 	RC_INCLUDE=-i
 	RC_DEFINE=-d
-	RC_DEPARG=='"$<"'
 	RES=res
     fi
 
-- 
cgit v0.12