Removed redundant mu_ prefix from mailutils/mu_argp.h.

@@ -46,6 +46,7 @@
 # include <strings.h>
 #endif
 
+#include <mailutils/argp.h>
 #include <mailutils/body.h>
 #include <mailutils/errno.h>
 #include <mailutils/error.h>
@@ -56,7 +57,6 @@
 #include <mailutils/mutil.h>
 #include <mailutils/registrar.h>
 #include <mailutils/stream.h>
-#include <mailutils/mu_argp.h>
 
 #include <argcv.h>
 

@@ -26,9 +26,8 @@
 #include <unistd.h>
 #include "getopt.h"
 
-#include <mailutils/mu_argp.h>
-
 #include <mailutils/address.h>
+#include <mailutils/argp.h>
 #include <mailutils/attribute.h>
 #include <mailutils/debug.h>
 #include <mailutils/errno.h>

@@ -34,6 +34,7 @@
 #include <unistd.h>
 
 #include <mailutils/address.h>
+#include <mailutils/argp.h>
 #include <mailutils/debug.h>
 #include <mailutils/errno.h>
 #include <mailutils/header.h>
@@ -42,7 +43,6 @@
 #include <mailutils/message.h>
 #include <mailutils/registrar.h>
 #include <mailutils/stream.h>
-#include <mailutils/mu_argp.h>
 
 const char *argp_program_version = "from (" PACKAGE ") " VERSION;
 const char *argp_program_bug_address = "<bug-mailutils@gnu.org>";

@@ -16,7 +16,8 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #include "guimb.h"
-#include <mailutils/mu_argp.h>
+
+#include <mailutils/argp.h>
 
 char *program_file;
 char *program_expr;

@@ -70,6 +70,7 @@
 #endif
 
 #include <mailutils/address.h>
+#include <mailutils/argp.h>
 #include <mailutils/attribute.h>
 #include <mailutils/body.h>
 #include <mailutils/envelope.h>
@@ -85,7 +86,6 @@
 #include <mailutils/parse822.h>
 #include <mailutils/registrar.h>
 #include <mailutils/stream.h>
-#include <mailutils/mu_argp.h>
 
 
 #ifdef __cplusplus

 pkginclude_HEADERS = \
  address.h \
+ argp.h \
  attribute.h \
  auth.h \
  body.h \
@@ -7,7 +8,6 @@ pkginclude_HEADERS = \
  envelope.h \
  errno.h \
  error.h \
- mu_features.h \
  filter.h \
  folder.h \
  header.h \
@@ -20,7 +20,6 @@ pkginclude_HEADERS = \
  message.h \
  mime.h \
  monitor.h \
- mu_argp.h \
  mutil.h \
  observer.h \
  parse822.h \

@@ -15,10 +15,11 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
-#ifndef MU_ARGP_H
-#define MU_ARGP_H 1
+#ifndef _MAILUTILS_ARGP_H
+#define _MAILUTILS_ARGP_H
+
+#include <mailutils/types.h>
 
-#include <mailutils/mailbox.h>
 #include <argp.h>
 
 #define MODE_INTERACTIVE 0
@@ -37,15 +38,14 @@ extern char *pam_service;
 extern int log_facility;
 extern int mu_argp_error_code;
 
-extern void mu_create_argcv __P((const char *capa[],
-				 int argc, char **argv,
-				 int *p_argc, char ***p_argv));
-extern error_t mu_argp_parse __P((const struct argp *argp, 
-				  int *p_argc, char ***p_argv,  
-				  unsigned flags,
-				  const char *capa[],
-				  int *arg_index,     
-				  void *input));
+extern void mu_create_argcv __P ((const char *capa[],
+				  int argc, char **argv,
+				  int *p_argc, char ***p_argv));
+extern error_t mu_argp_parse __P ((const struct argp * argp,
+				   int *p_argc, char ***p_argv,
+				   unsigned flags,
+				   const char *capa[],
+				   int *arg_index, void *input));
 
 #endif
 

@@ -16,6 +16,7 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #include <mailutils/address.h>
+#include <mailutils/argp.h>
 #include <mailutils/attribute.h>
 #include <mailutils/auth.h>
 #include <mailutils/body.h>

@@ -68,6 +68,7 @@
 # define INADDR_LOOPBAK 0x7f000001
 #endif
 
+#include <mailutils/argp.h>
 #include <mailutils/attribute.h>
 #include <mailutils/errno.h>
 #include <mailutils/error.h>
@@ -79,7 +80,6 @@
 #include <mailutils/registrar.h>
 #include <mailutils/stream.h>
 #include <mailutils/url.h>
-#include <mailutils/mu_argp.h>
 
 #include <mu_dbm.h>
 

@@ -59,6 +59,7 @@
 #endif
 
 #include <mailutils/address.h>
+#include <mailutils/argp.h>
 #include <mailutils/attribute.h>
 #include <mailutils/body.h>
 #include <mailutils/debug.h>
@@ -75,7 +76,6 @@
 #include <mailutils/registrar.h>
 #include <mailutils/stream.h>
 #include <mailutils/url.h>
-#include <mailutils/mu_argp.h>
 
 #include <argcv.h>
 #include <getline.h>

@@ -20,7 +20,6 @@
 #endif
 
 #include <mailutils/mailutils.h>
-#include <mailutils/mu_argp.h>
 
 #include <stdio.h>
 

@@ -109,6 +109,7 @@
 # include <strings.h>
 #endif
 
+#include <mailutils/argp.h>
 #include <mailutils/attribute.h>
 #include <mailutils/body.h>
 #include <mailutils/errno.h>
@@ -121,7 +122,6 @@
 #include <mailutils/mutil.h>
 #include <mailutils/registrar.h>
 #include <mailutils/url.h>
-#include <mailutils/mu_argp.h>
 
 /* For Berkley DB2 APOP password file */
 #ifdef HAVE_DB_H

@@ -39,6 +39,7 @@ sieve script interpreter.
 
 #include "sieve.h"
 
+#include <mailutils/argp.h>
 #include <mailutils/auth.h>
 #include <mailutils/errno.h>
 #include <mailutils/folder.h>
@@ -47,7 +48,6 @@ sieve script interpreter.
 #include <mailutils/mutil.h>
 #include <mailutils/registrar.h>
 #include <mailutils/stream.h>
-#include <mailutils/mu_argp.h>
 
 void mutil_register_all_mbox_formats(void);