Move gnulib into a subdir.

* bootstrap.conf: Create and populate lib/gnu, if necessary.
* configure.ac (MU_APP_COMMON_INCLUDES): Update.
(AC_CONFIG_FILES): Build lib/gnu/Makefile
* lib/Makefile.am (libmuaux_a_SOURCES): Add all objects from gnu/
* po/POTFILES.in: Update.

* examples/.gitignore: Update.

6 files changed, 30 insertions, 16 deletions

diff --git a/bootstrap.conf b/bootstrap.conf
index 9bd58062a..5361ef2d4 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -15,7 +15,19 @@
 # You should have received a copy of the GNU General Public License
 # along with GNU Mailutils.  If not, see <http://www.gnu.org/licenses/>.
 
-gnulib_name=libmuaux
+test -d lib/gnu || mkdir lib/gnu
+test -f lib/gnu/Makefile.am || cat > lib/gnu/Makefile.am <<EOT
+# THIS FILE IS GENERATED AUTOMATICALLY.  PLEASE DO NOT EDIT.
+include gnulib.mk
+AM_CPPFLAGS += @MU_LIB_COMMON_INCLUDES@ -I${top_srcdir}/lib/gnu -I${top_builddir}/lib/gnu
+# Local Variables:
+# buffer-read-only: t
+# End:
+# vi: set ro:
+EOT
+
+gnulib_name=libgnu
+source_base=lib/gnu
 
 # We don't need these modules, even though gnulib-tool mistakenly
 # includes them because of gettext dependencies.
diff --git a/configure.ac b/configure.ac
index ca3c1e759..03d4b636a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -69,7 +69,7 @@ AC_SUBST(MU_APP_LIBRARIES,'../libmu_argp/libmu_argp.a ../libmu_cfg/libmu_cfg.la
 
 AC_SUBST(MU_LIB_COMMON_INCLUDES,'-I${top_builddir} -I${top_srcdir}/include  -I${top_builddir}/include')
 
-AC_SUBST(MU_APP_COMMON_INCLUDES,'-I${srcdir} -I${top_srcdir}/include -I${top_srcdir}/lib -I${top_builddir}/lib -I${top_builddir} -I${top_builddir}/include -I${top_srcdir}/libmu_argp -I${top_srcdir}/libmu_cfg')
+AC_SUBST(MU_APP_COMMON_INCLUDES,'-I${srcdir} -I${top_srcdir}/include -I${top_srcdir}/lib -I${top_srcdir}/lib/gnu -I${top_builddir}/lib/gnu -I${top_builddir} -I${top_builddir}/include -I${top_srcdir}/libmu_argp -I${top_srcdir}/libmu_cfg')
 
 dnl Check for programs
 AC_PROG_CC
@@ -116,8 +116,8 @@ AC_CHECK_TYPE(iconv_t,:,
 # To make these two headers accessible for the libraries, they are linked
 # to include/.
 #
-AC_CONFIG_LINKS(include/gettext.h:lib/gettext.h)
-AC_CONFIG_LINKS(include/intprops.h:lib/intprops.h)
+AC_CONFIG_LINKS(include/gettext.h:lib/gnu/gettext.h)
+AC_CONFIG_LINKS(include/intprops.h:lib/gnu/intprops.h)
 
 AH_BOTTOM([
 #define DEFAULT_TEXT_DOMAIN PACKAGE
@@ -1462,6 +1462,7 @@ AC_CONFIG_FILES([
  include/mailutils/sys/Makefile
  include/mailutils/cpp/Makefile
  lib/Makefile
+ lib/gnu/Makefile
  libmu_argp/Makefile
  libmu_auth/Makefile
  libmu_cfg/Makefile
diff --git a/examples/.gitignore b/examples/.gitignore
index 890812aae..e75f2264a 100644
--- a/examples/.gitignore
+++ b/examples/.gitignore
@@ -12,6 +12,7 @@ listop
 lsf
 mailcap
 mblconv
+mboxidx
 mimetest
 msg-send
 mta
diff --git a/include/mailutils/debug.h b/include/mailutils/debug.h
index cb026f740..ed117f0c3 100644
--- a/include/mailutils/debug.h
+++ b/include/mailutils/debug.h
@@ -81,7 +81,7 @@ void mu_debug_log_cont (const char *fmt, ...) MU_PRINTFLIKE(1,2);
 void mu_debug_log_end (const char *fmt, ...) MU_PRINTFLIKE(1,2);
 void mu_debug_log_nl (void);
 
-  int mu_debug_get_iterator (mu_iterator_t *piterator, int skipunset);
+int mu_debug_get_iterator (mu_iterator_t *piterator, int skipunset);
 
   
 #define MU_ASSERT(expr)						\
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 559dd39ee..9bda10f61 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -15,11 +15,11 @@
 ## You should have received a copy of the GNU General Public License
 ## along with GNU Mailutils.  If not, see <http://www.gnu.org/licenses/>. 
 
-include gnulib.mk
+SUBDIRS = gnu .
 
-AM_CPPFLAGS += @MU_LIB_COMMON_INCLUDES@ 
-
-libmuaux_a_SOURCES += \
+AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@ -I${top_srcdir}/lib/gnu -I${top_builddir}/lib/gnu
+noinst_LIBRARIES = libmuaux.a
+libmuaux_a_SOURCES = \
  argp_base.c\
  daemon.c\
  mailcap.c\
@@ -29,14 +29,14 @@ libmuaux_a_SOURCES += \
  tcpwrap.c\
  mu_umaxtostr.c\
  mu_umaxtostr.h
+libmuaux_a_LIBADD=gnu/*.o
+#libmuaux_a_LIBADD=`$(AR) t gnu/libgnu.a | sed s.^.gnu/.`
 
-noinst_HEADERS +=\
+noinst_HEADERS =\
  mailcap.h\
  muaux.h\
  tcpwrap.h
 
-EXTRA_DIST += utmp.c
-gl_LIBOBJS += @LIBOBJS@
-gl_LTLIBOBJS += @LTLIBOBJS@
+EXTRA_DIST = utmp.c
 
 
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 95abad3ae..eb39744a4 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -25,9 +25,9 @@ imap4d/signal.c
 imap4d/starttls.c
 imap4d/util.c
 
-lib/argp-help.c
-lib/argp-parse.c
-lib/getopt.c
+lib/gnu/argp-help.c
+lib/gnu/argp-parse.c
+lib/gnu/getopt.c
 lib/mailcap.c
 lib/tcpwrap.c
 lib/strexit.c