(AM_CPPFLAGS): Removed

 ## Process this file with GNU Automake to create Makefile.in
 
-##   Copyright (C) 2005 Free Software Foundation, Inc.
+##   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 ##
 ##   GNU Mailutils is free software; you can redistribute it and/or
 ##   modify it under the terms of the GNU General Public License as
@@ -20,7 +20,6 @@
 INCLUDES = @MU_COMMON_INCLUDES@ @INTLINCS@
 
 bin_PROGRAMS = mailutils-config
-AM_CPPFLAGS = -DGNULIB_ARGP_EXTERN_BASENAME=1
 
 mailutils_config_SOURCES = mailutils-config.c
 mailutils_config_LDADD = \

@@ -20,7 +20,7 @@
 
 INCLUDES = @MU_COMMON_INCLUDES@ -I${top_srcdir}/libproto/include @INTLINCS@
 
-AM_CPPFLAGS = -DSITE_VIRTUAL_PWDDIR=\"@SITE_VIRTUAL_PWDDIR@\" -DGNULIB_ARGP_EXTERN_BASENAME=1
+AM_CPPFLAGS = -DSITE_VIRTUAL_PWDDIR=\"@SITE_VIRTUAL_PWDDIR@\" 
 YLWRAP = $(SHELL) $(top_srcdir)/scripts/ylwrap
 AM_YFLAGS=-vt
 

 ## Process this file with GNU Automake to create Makefile.in
 
-##   Copyright (C) 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
+##   Copyright (C) 1999, 2000, 2001, 2002, 2006 Free Software Foundation, Inc.
 ##
 ##   GNU Mailutils is free software; you can redistribute it and/or
 ##   modify it under the terms of the GNU General Public License as
@@ -19,7 +19,6 @@
 
 INCLUDES = @MU_COMMON_INCLUDES@ @INTLINCS@ @MU_AUTHINCS@
 bin_PROGRAMS = movemail
-AM_CPPFLAGS = -DGNULIB_ARGP_EXTERN_BASENAME=1
 
 movemail_LDADD = \
  ../lib/libmuaux.la\