[PATCH 21.5] Xpm no-X builds fail on current cygwin (with /bin/gcc)

This is the 21.5 version of the patch I posted previously. ChangeLog addition: 2006-01-30 Vin Shelton <acs(a)xemacs.org&gt; * configure.ac: Simplify cygwin include and no-X Xpm handling. As of cygwin-1.5.19 (if you're using /bin/gcc), 'gcc -print-file-name=libc.a' (effectively) returns '/lib' instead of '/usr/lib', so we'll use 'gcc -print-search-dirs' instead. 21.5 source patch: Diff command: cvs -q diff -u Files affected: configure.ac Index: configure.ac =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/configure.ac,v retrieving revision 1.32 diff -a -u -u -r1.32 configure.ac --- configure.ac 2005/12/27 18:51:01 1.32 +++ configure.ac 2006/02/01 02:55:38 ＠＠ -2162,9 +2162,9 ＠＠ dnl XEmacs supported mingw and cygnus have made this incompatible change dnl so we just go with the flow. case "$opsys" in mingw* | cygwin*) - cygwin_include=`eval "gcc -print-file-name=libc.a"` ; - cygwin_include=`eval "dirname $cygwin_include"` ; - cygwin_include="-I$cygwin_include/../include" ; + cygwin_include=`eval gcc -print-search-dirs | sed -ne s'/install: //p'` + cygwin_include=`eval "cd $cygwin_include/../../../..; pwd"` + cygwin_include="-I$cygwin_include/include" ; extra_includes="$cygwin_include/mingw $cygwin_include" ; case "$opsys" in mingw*) XE_APPEND($extra_includes, c_switch_system) ;; ＠＠ -3938,9 +3938,8 ＠＠ incpath_xpm= case "$opsys" in cygwin*) - cygwin_top=`eval "gcc -print-file-name=libc.a"` ; - cygwin_top=`eval "dirname ${cygwin_top}"`; - cygwin_top="${cygwin_top}/.."; + cygwin_top=`eval gcc -print-search-dirs | sed -ne s'/install: //p'` + cygwin_top=`eval "cd $cygwin_top/../../../..; pwd"` case "$window_system" in dnl use "standard" search pattern x11) ;;