Sponsor Request: jigdo

[Bill Nottingham]

Chuck R. Anderson (cra at WPI.EDU) said: 
> It won't build on FC4--perhaps someone can help me with that.

Here's the 5 second fix. Of course, the actual warnings it's spewing
should probably be looked at. :)

Bill
-------------- next part --------------
diff -ru jigdo-0.7.1/configure jigdo-0.7.1-fixed/configure
--- jigdo-0.7.1/configure	2004-06-20 16:49:15.000000000 -0400
+++ jigdo-0.7.1-fixed/configure	2005-04-15 17:56:53.000000000 -0400
@@ -6884,7 +6884,7 @@
 
 if test "$jigdo_debug" = "yes"; then
     #if test "$GCC" = yes; then CFLAGS="$CFLAGS -Werror"; fi
-    if test "$GXX" = yes; then CXXFLAGS="$CXXFLAGS -Werror"; fi
+    if test "$GXX" = yes; then CXXFLAGS="$CXXFLAGS"; fi
 fi
 if test "$GXX" = "yes"; then
     CFLAGS="-Wall $CFLAGS -W"
diff -ru jigdo-0.7.1/src/util/log.cc jigdo-0.7.1-fixed/src/util/log.cc
--- jigdo-0.7.1/src/util/log.cc	2003-09-27 17:31:04.000000000 -0400
+++ jigdo-0.7.1-fixed/src/util/log.cc	2005-04-15 17:55:22.000000000 -0400
@@ -62,7 +62,7 @@
   cerr << Subst::subst(format, args, arg) << endl;
 }
 
-Logger::OutputFunction* Logger::output = &defaultPut;
+OutputFunction* Logger::output = &defaultPut;
 //______________________________________________________________________
 
 /* The value of the --debug cmd line option is either missing (empty) or a
diff -ru jigdo-0.7.1/src/util/log.hh jigdo-0.7.1-fixed/src/util/log.hh
--- jigdo-0.7.1/src/util/log.hh	2003-09-16 19:32:10.000000000 -0400
+++ jigdo-0.7.1-fixed/src/util/log.hh	2005-04-15 17:53:50.000000000 -0400
@@ -101,14 +101,14 @@
 #  endif
 #endif
 //______________________________________________________________________
+  /** Logged strings are output via a OutputFunction* pointer. */
+  typedef void (OutputFunction)(const string& unitName,
+      unsigned char unitNameLen, const char* format, int args,
+      const Subst arg[]);
 
 class Logger : NoCopy {
 public:
 
-  /** Logged strings are output via a OutputFunction* pointer. */
-  typedef void (Logger::OutputFunction)(const string& unitName,
-      unsigned char unitNameLen, const char* format, int args,
-      const Subst arg[]);
   /** Default output function prints to stderr */
   static void defaultPut(const string& unitName, unsigned char unitNameLen,
                          const char* format, int args, const Subst arg[]);