changeset 5500:01900734203a

Auto merge.
author Jeff Sparkes <jsparkes@gmail.com>
date Tue, 03 May 2011 08:13:21 -0400
parents 4b5b7dcc19d6 (diff) eb4eeec50f25 (current diff)
children 4813ff11c6e2
files
diffstat 2 files changed, 6 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Tue May 03 01:43:36 2011 +0900
+++ b/ChangeLog	Tue May 03 08:13:21 2011 -0400
@@ -1,3 +1,8 @@
+2011-05-02  Jeff Sparkes  <jsparkes@gmail.com>
+
+	* configure.ac (HAVE_MS_WINDOWS): On cygwin, use the w32api package
+	libraries in /usr/lib/w32api.  Fix for tracker issue745.
+
 2011-04-29  Stephen J. Turnbull  <stephen@xemacs.org>
 
 	* XEmacs 21.5.31 "ginger" is released.
--- a/configure.ac	Tue May 03 01:43:36 2011 +0900
+++ b/configure.ac	Tue May 03 08:13:21 2011 -0400
@@ -3243,7 +3243,7 @@
     fi
 
     install_pp="$srcdir/lib-src/installexe.sh"
-    XE_APPEND(-limm32 -lshell32 -lgdi32 -luser32 -lcomdlg32 -lcomctl32 -lole32 -luuid -lwinspool -lmpr, libs_system)
+    XE_APPEND(-L/usr/lib/w32api -limm32 -lshell32 -lgdi32 -luser32 -lcomdlg32 -lcomctl32 -lole32 -luuid -lwinspool -lmpr, libs_system)
     if test "$with_dragndrop" != no; then
       XE_APPEND(msw, dragndrop_proto)
       with_dragndrop=yes