[Nmh-workers] nmh 1.1RC4: doesn't compile if configured --with-apop

[pmaydell]

./configure --enable-apop
[configure output snipped]
make
[make output snipped]
gcc -c -DHAVE_CONFIG_H -I.. -I. -I..   -Wall -O2 popsbr.c
popsbr.c: In function `pop_init':
popsbr.c:609: error: `apop' undeclared (first use in this function)
popsbr.c:609: error: (Each undeclared identifier is reported only once
popsbr.c:609: error: for each function it appears in.)
make[1]: *** [popsbr.o] Error 1

Simple fix -- move variable declaration/init up to top of function
(it was mistakenly put inside an else {} clause). [I don't use apop
so make no guarantees about whether functionality actually works;
I merely noticed it because debian packages are compiled this way
and I built nmh 1.1RC4 using (a modified version of) the debian
packaging for the previous version of nmh.]

===begin patch===
--- uip/popsbr.c        2005-05-18 14:24:14.000000000 +0100
+++ uip/popsbr.c.patch  2005-10-25 00:27:50.000000000 +0100
@@ -500,6 +500,13 @@
     int fd1, fd2;
     char buffer[BUFSIZ];
 
+#ifdef APOP
+    int apop;
+
+    if ((apop = rpop) < 0)
+       rpop = 0;
+#endif
+
     if (proxy && *proxy) {
        int pid;
        int inpipe[2];    /* for reading from the server */
@@ -549,13 +556,6 @@
 
     } else {
 
-#ifdef APOP
-       int apop;
-
-       if ((apop = rpop) < 0)
-           rpop = 0;
-#endif
-
 #ifndef NNTP
 # ifdef KPOP
        if ( kpop ) {

===endit===

-- PMM