Normal build is now with POP2 disabled and optimization on.

svn path=/trunk/; revision=1080

7 files changed, 49 insertions, 6 deletions

diff --git a/INSTALL b/INSTALL
index 5febf441..df1189cf 100644
--- a/INSTALL
+++ b/INSTALL
@@ -22,7 +22,18 @@ variable CC before you run configure.
 
 The configure script accepts certain standard configuration options.
 These include --prefix, --exec-prefix, --bindir, --infodir, --mandir,
-and --srcdir.  Do `config --help' for more.
+and --srcdir.  Do `configure --help' for more.
+
+POP2 support is no longer compiled in by default, as POP2 is way obsolete
+and there don't seem to be any live servers for it anymore.  You can
+configure it back in if you want with `configure --enable-POP2', but
+leaving it out cuts the executable's size slightly.
+
+If you want to build for debugging, 
+
+	CFLAGS=-g LDFLAGS=" " ./configure
+
+will do that.
 
 If you're running QNX, edit the distributed Makefile directly.  The
 QNX values for various macros are there but commented out; all you
diff --git a/NEWS b/NEWS
index ce9e2cc2..f1e51941 100644
--- a/NEWS
+++ b/NEWS
@@ -25,6 +25,8 @@ fetchmail-4.0 ():
 * Architecture-independent RPM building.
 * If a .fetchmailrc entry has multiple user parts, the opening `username'
   keyword is now required for all.
+* POP2 support is no longer compiled by default, but you can configure
+  it in with `configure --enable-POP2'.
 
 There are 256 people on the fetchmail-friends list.
 
diff --git a/acconfig.h b/acconfig.h
index d416b9a7..d03909cd 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -46,6 +46,9 @@
 #undef SIZEOF_SHORT
 #undef SIZEOF_LONG
 
+/* Define if you want POP2 support compiled in */
+#undef POP2_ENABLE
+
 
 /* Leave that blank line there!!  Autoheader needs it.
    If you're adding to this file, keep in mind:
diff --git a/configure.in b/configure.in
index 4398fa4c..d98ceff8 100644
--- a/configure.in
+++ b/configure.in
@@ -8,8 +8,8 @@ AC_INIT(fetchmail.h)		dnl A distinctive file to look for in srcdir.
 AC_CONFIG_HEADER(config.h)
 
 # We want these before the checks, so the checks can modify their values.
-test -z "$CFLAGS" && CFLAGS=-g AC_SUBST(CFLAGS)
-test -z "$LDFLAGS" && LDFLAGS=-g AC_SUBST(LDFLAGS)
+test -z "$CFLAGS" && CFLAGS=-O AC_SUBST(CFLAGS)
+test -z "$LDFLAGS" && LDFLAGS=-s AC_SUBST(LDFLAGS)
 
 AC_CANONICAL_HOST
 AC_PROG_CC
@@ -131,6 +131,13 @@ AC_CHECK_SIZEOF(short)
 AC_CHECK_SIZEOF(int)
 AC_CHECK_SIZEOF(long)
 
+###	use option --enable-POP2 to compile in the POP2 fallback support
+AC_ARG_ENABLE(POP2,
+	[  --enable-POP2        compile in POP2 protocol support (obsolete)],
+	[with_POP2=$enableval],
+	[with_POP2=no])
+test "$with_POP2" = "yes" && AC_DEFINE(POP2_ENABLE)
+
 AC_OUTPUT(Makefile, [
 # Makefile uses this timestamp file to know when to remake Makefile,
 # build.sh, and glob/Makefile.
diff --git a/fetchmail-FAQ.html b/fetchmail-FAQ.html
index be60e5e6..b91a7ebd 100644
--- a/fetchmail-FAQ.html
+++ b/fetchmail-FAQ.html
@@ -153,7 +153,14 @@ unless your symptom seems to involve an error in configuration parsing.<p>
 A transcript of the failed session with -v on is almost always useful.
 If the bug involves a core dump or hang, a gdb stack trace is good to have.
 (Bear in mind that you can attach gdb to a running but hung process by
-giving the process ID as a second argument.)<p>
+giving the process ID as a second argument.)  You will need to
+reconfigure with <p>
+
+<LISTING>
+CFLAGS=-g LDFLAGS=" " ./configure
+</LISTING>
+
+and then rebuild in order to generate a version that can br gdb-traced.<p>
 
 Best of all is a mail file which, when fetched, will reproduce the
 bug under the latest (current) version.<p>
@@ -978,7 +985,7 @@ without hacking potentially fragile startup scripts.  To get around
 it, just touch(1) the logfile before you run fetchmail (this will have
 no effect on the contents of the logfile if it already exists).<P>
 
-$Id: fetchmail-FAQ.html,v 1.27 1997/06/10 20:30:50 esr Exp $<p>
+$Id: fetchmail-FAQ.html,v 1.28 1997/06/11 04:28:15 esr Exp $<p>
 
 <HR>
 <ADDRESS>Eric S. Raymond <A HREF="mailto:esr@thyrsus.com">&lt;esr@snark.thyrsus.com&gt;</A></ADDRESS>
diff --git a/fetchmail.c b/fetchmail.c
index b0c0f925..2f8abdba 100644
--- a/fetchmail.c
+++ b/fetchmail.c
@@ -736,7 +736,9 @@ static char *showproto(int proto)
     switch (proto)
     {
     case P_AUTO: return("auto"); break;
+#ifdef POP2_ENABLE
     case P_POP2: return("POP2"); break;
+#endif /* POP2_ENABLE */
     case P_POP3: return("POP3"); break;
     case P_IMAP: return("IMAP"); break;
     case P_IMAP_K4: return("IMAP-K4"); break;
@@ -750,7 +752,11 @@ static char *showproto(int proto)
 /*
  * Sequence of protocols to try when autoprobing, most capable to least.
  */
+#ifdef POP2_ENABLE
 static const int autoprobe[] = {P_IMAP, P_POP3, P_POP2};
+#else
+static const int autoprobe[] = {P_IMAP, P_POP3};
+#endif /* POP2_ENABLE */
 
 static int query_host(struct query *ctl)
 /* perform fetch transaction with single host */
@@ -790,7 +796,12 @@ static int query_host(struct query *ctl)
 	return(st);
 	break;
     case P_POP2:
+#ifdef POP2_ENABLE
 	return(doPOP2(ctl));
+#else
+	fprintf(stderr, "POP2 support is not configured.\n");
+	return(PS_PROTOCOL);
+#endif /* POP2_ENABLE */
 	break;
     case P_POP3:
     case P_APOP:
diff --git a/pop2.c b/pop2.c
index 51ddd295..d9e9990e 100644
--- a/pop2.c
+++ b/pop2.c
@@ -1,5 +1,5 @@
 /*
- * pop2.c -- POP@ protocol methods
+ * pop2.c -- POP2 protocol methods
  *
  * Copyright 1996 by Eric S. Raymond
  * All rights reserved.
@@ -7,6 +7,7 @@
  */
 
 #include  <config.h>
+#ifdef POP2_ENABLE
 #include  <stdio.h>
 #if defined(STDC_HEADERS)
 #include <stdlib.h>
@@ -137,5 +138,6 @@ int doPOP2 (struct query *ctl)
     peek_capable = FALSE;
     return(do_protocol(ctl, &pop2));
 }
+#endif /* POP2_ENABLE */
 
 /* pop2.c ends here */