* summer works even if passed multiple option-containing args.

* workaround for nettle bug, supply -lgmp if -lnettle.

diff --git a/cprogs/Makefile b/cprogs/Makefile
index 6438c983842829a69d5f85a89e0d76f3c0c176c1..01f375d0e5070606bac63414e020587ae28af5d5 100644 (file)
--- a/cprogs/Makefile
+++ b/cprogs/Makefile
@@ -48,10 +48,10 @@ xacpi-simple:       xacpi-simple.o
                $(CC) -o $@ $< -L/usr/X11R6/lib -lX11 -lm
 
 summer:                summer.o
-               $(CC) -o $@ $< -lnettle
+               $(CC) -o $@ $< -lnettle -lgmp
 
 watershed:     watershed.o
-               $(CC) -o $@ $< -lnettle
+               $(CC) -o $@ $< -lnettle -lgmp
 
 install:               all
                $(INSTALL_DIRECTORY) $(bindir) $(sbindir)

diff --git a/cprogs/summer.c b/cprogs/summer.c
index 3970c369b58477ae6390af6be8c874999fc92c9b..12419210d74eafa295584e4a74c3eb3d409fd5ba 100644 (file)
--- a/cprogs/summer.c
+++ b/cprogs/summer.c
@@ -361,7 +361,7 @@ int main(int argc, const char *const *argv) {
 
   errfile= stderr;
   
-  if ((arg=argv[1]) && *arg++=='-') {
+  while ((arg=argv[1]) && *arg++=='-') {
     while ((c=*arg++)) {
       switch (c) {
       case 'h':

diff --git a/debian/changelog b/debian/changelog
index 2c8e55c9aedfd3b63f26ec4645a665c8e828cc3e..59651bcc7d03df5604da32cc94ae5b7d4509bba0 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+chiark-utils (4.1.18) unstable; urgency=low
+
+  * summer works even if passed multiple option-containing args.
+  * workaround for nettle bug, supply -lgmp if -lnettle.
+
+ -- Ian Jackson <ian@davenant.greenend.org.uk>  Wed, 23 May 2007 19:42:05 +0100
+
 chiark-utils (4.1.17) unstable; urgency=low
 
   * summer has new -M (do not print mtimes) option.