[Patch] Fix setup to build with gcc2-2.95.3-10

[Max Bowsher]

setup currently has a couple of build bugs when built with the gcc2
compiler. Fix here.


######################### ChangeLog (sorry, OE doesn't do tabs)
###########################
2002-10-29  Max Bowsher  <maxb@ukf.net>

* Makefile.am (%.o: %.rc): Add --preprocessor option making windres use the
$CC in use, not just assume gcc (needed for gcc2).
(setup_LDADD): Remove -lstdc++ (unneeded and broke build with gcc2).
(inilint_LDADD): Ditto.

############################ Patch ###############################
Index: Makefile.am
===================================================================
RCS file: /home/max/cvsmirror/cygwin-apps-cvs/setup/Makefile.am,v
retrieving revision 2.22
diff -u -p -r2.22 Makefile.am
--- Makefile.am 2002/07/09 06:57:40 2.22
+++ Makefile.am 2002/10/26 16:15:03
@@ -76,7 +76,7 @@ else
   rsync_source =
 endif

-inilint_LDADD = libgetopt++/libgetopt++.la -lstdc++ -luser32 -lkernel32
+inilint_LDADD = libgetopt++/libgetopt++.la -luser32 -lkernel32
 inilint_SOURCES = \
   filemanip.cc \
   filemanip.h \
@@ -113,7 +113,7 @@ inilint_SOURCES = \
 setup_LDADD = res.o zlib/libzcygw.a bz2lib/libbz2.a \
  libgetopt++/libgetopt++.la \
  @RSYNCLIB@ \
- -lstdc++ -luser32 -lkernel32 \
+ -luser32 -lkernel32 \
  -lcomctl32 -lole32 -lwsock32 -lnetapi32 -ladvapi32 -luuid
 setup_LDFLAGS = -mwindows
 setup_SOURCES = \
@@ -284,7 +284,7 @@ setup_version.c : $(srcdir)/ChangeLog Ma
  mv version.tmp setup_version.c

 %.o: %.rc
- $(WINDRES) --include-dir $(srcdir) -o $@ $<
+ $(WINDRES) --preprocessor "$(CC) -E -xc-header -DRC_INVOKED" --include-dir
$(srcdir) -o $@ $<

 autoload.o: autoload.c
 @AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
######################################################################