Skip to content

John McEleney / mailutils

Go to a project
Toggle navigation
Toggle navigation pinning
Commit 45540e1d 45540e1d4744eaea8a86f7e7f03fc6f6f3000cf5 by Sergey Poznyakoff
Options

Merge branch 'master' of ssh://gray@git.savannah.gnu.org/srv/git/mailutils

2 parents c1851318 72d640b2
Inline Side-by-side
Showing 1 changed file with 9 additions and 9 deletions
1 /* GNU Mailutils -- a suite of utilities for electronic mail 1 /* GNU Mailutils -- a suite of utilities for electronic mail
2 Copyright (C) 1999, 2000, 2001, 2002, 2007 Free Software Foundation, Inc. 2 Copyright (C) 1999, 2000, 2001, 2002, 2007, 2009
3 Free Software Foundation, Inc.
3 4
4 GNU Mailutils is free software; you can redistribute it and/or modify 5 GNU Mailutils is free software; you can redistribute it and/or modify
5 it under the terms of the GNU General Public License as published by 6 it under the terms of the GNU General Public License as published by
...@@ -116,7 +117,7 @@ struct lib_descr { ...@@ -116,7 +117,7 @@ struct lib_descr {
116 { "pop", "mu_pop", NEEDAUTH }, 117 { "pop", "mu_pop", NEEDAUTH },
117 { "nntp", "mu_nntp", 0 }, 118 { "nntp", "mu_nntp", 0 },
118 { "mailer", "mu_mailer", 0 }, 119 { "mailer", "mu_mailer", 0 },
119 { "sieve", "sieve", NOTALL }, 120 { "sieve", "mu_sieve", NOTALL },
120 { NULL } 121 { NULL }
121 }; 122 };
122 123
...@@ -145,7 +146,7 @@ add_entry (int level, char *ptr) ...@@ -145,7 +146,7 @@ add_entry (int level, char *ptr)
145 nentry++; 146 nentry++;
146 } 147 }
147 148
148 /* Sort the entires by their level. */ 149 /* Sort the entries by their level. */
149 void 150 void
150 sort_entries () 151 sort_entries ()
151 { 152 {
...@@ -204,7 +205,7 @@ main (int argc, char **argv) ...@@ -204,7 +205,7 @@ main (int argc, char **argv)
204 { 205 {
205 if (strcmp (argv[0], "auth") == 0) 206 if (strcmp (argv[0], "auth") == 0)
206 { 207 {
207 add_entry (2, "-lmuauth " AUTHLIBS); 208 add_entry (2, "-lmu_auth " AUTHLIBS);
208 } 209 }
209 #ifdef WITH_GUILE 210 #ifdef WITH_GUILE
210 else if (strcmp (argv[0], "guile") == 0) 211 else if (strcmp (argv[0], "guile") == 0)
...@@ -213,9 +214,9 @@ main (int argc, char **argv) ...@@ -213,9 +214,9 @@ main (int argc, char **argv)
213 } 214 }
214 #endif 215 #endif
215 else if (strcmp (argv[0], "cfg") == 0) 216 else if (strcmp (argv[0], "cfg") == 0)
216 add_entry (-1, "-lmucfg"); 217 add_entry (-1, "-lmu_cfg");
217 else if (strcmp (argv[0], "argp") == 0) 218 else if (strcmp (argv[0], "argp") == 0)
218 add_entry (-2, "-lmuargp"); 219 add_entry (-2, "-lmu_argp");
219 else if (strcmp (argv[0], "all") == 0) 220 else if (strcmp (argv[0], "all") == 0)
220 { 221 {
221 struct lib_descr *p; 222 struct lib_descr *p;
...@@ -227,7 +228,7 @@ main (int argc, char **argv) ...@@ -227,7 +228,7 @@ main (int argc, char **argv)
227 asprintf (&ptr, "-l%s", p->libname); 228 asprintf (&ptr, "-l%s", p->libname);
228 add_entry (0, ptr); 229 add_entry (0, ptr);
229 if (p->flags & NEEDAUTH) 230 if (p->flags & NEEDAUTH)
230 add_entry (2, "-lmuauth " AUTHLIBS); 231 add_entry (2, "-lmu_auth " AUTHLIBS);
231 } 232 }
232 } 233 }
233 else 234 else
...@@ -243,7 +244,7 @@ main (int argc, char **argv) ...@@ -243,7 +244,7 @@ main (int argc, char **argv)
243 asprintf (&ptr, "-l%s", p->libname); 244 asprintf (&ptr, "-l%s", p->libname);
244 add_entry (0, ptr); 245 add_entry (0, ptr);
245 if (p->flags & NEEDAUTH) 246 if (p->flags & NEEDAUTH)
246 add_entry (2, "-lmuauth " AUTHLIBS); 247 add_entry (2, "-lmu_auth " AUTHLIBS);
247 } 248 }
248 else 249 else
249 { 250 {
...@@ -299,4 +300,3 @@ main (int argc, char **argv) ...@@ -299,4 +300,3 @@ main (int argc, char **argv)
299 return 0; 300 return 0;
300 } 301 }
301 302
302
......