From 31b749c3a754cb72ccda24fe6076c0ba95bde783 Mon Sep 17 00:00:00 2001
From: Richard Jones <rjones@redhat.com>
Date: Wed, 14 Jan 2009 16:29:25 +0000
Subject: [PATCH] Added gnulib and gnulib stdint module.

---
 .gitignore         |  1 +
 Makefile.am        |  4 ++++
 configure.ac       |  9 ++++++---
 lib/.gitignore     |  4 ++++
 m4/.gitignore      | 10 ++++++++++
 m4/gnulib-cache.m4 | 35 +++++++++++++++++++++++++++++++++++
 6 files changed, 60 insertions(+), 3 deletions(-)
 create mode 100644 lib/.gitignore
 create mode 100644 m4/.gitignore
 create mode 100644 m4/gnulib-cache.m4

diff --git a/.gitignore b/.gitignore
index 0469c8a..940bbf5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -39,3 +39,4 @@ m4/ltoptions.m4
 m4/ltsugar.m4
 m4/ltversion.m4
 m4/lt~obsolete.m4
+/link-warning.h
diff --git a/Makefile.am b/Makefile.am
index bb251c2..ec44f98 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,9 @@
+SUBDIRS = lib
+
 ACLOCAL_AMFLAGS = -I m4
 
+EXTRA_DIST = m4/gnulib-cache.m4
+
 nobase_include_HEADERS = rpc/rpc.h rpc/types.h rpc/xdr.h
 
 lib_LTLIBRARIES = libportablexdr.la
diff --git a/configure.ac b/configure.ac
index fed9614..27b51e8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,11 +2,12 @@ AC_INIT(portablexdr, 4.9.2)
 AM_INIT_AUTOMAKE
 
 AC_CONFIG_HEADERS([config.h])
-
 AC_CONFIG_MACRO_DIR([m4])
 
 AC_CANONICAL_HOST
 AC_PROG_CC
+gl_EARLY
+
 AM_PROG_CC_C_O
 
 AC_PROG_INSTALL
@@ -15,6 +16,8 @@ AC_PROG_LIBTOOL
 AC_PROG_LEX
 AC_PROG_YACC
 
+gl_INIT
+
 AC_TYPE_SIZE_T
 AC_TYPE_SSIZE_T
 AC_TYPE_OFF_T
@@ -42,5 +45,5 @@ AC_SUBST(MINGW_EXTRA_LDFLAGS)
 AC_CHECK_HEADERS([arpa/inet.h sys/param.h])
 AC_CHECK_FUNCS([ntohl htonl ntohs htons])
 
-AC_OUTPUT(Makefile)
-
+AC_CONFIG_FILES([Makefile lib/Makefile])
+AC_OUTPUT
diff --git a/lib/.gitignore b/lib/.gitignore
new file mode 100644
index 0000000..abd3d67
--- /dev/null
+++ b/lib/.gitignore
@@ -0,0 +1,4 @@
+/Makefile.am
+/dummy.c
+/stdint.in.h
+/wchar.in.h
diff --git a/m4/.gitignore b/m4/.gitignore
new file mode 100644
index 0000000..aee276e
--- /dev/null
+++ b/m4/.gitignore
@@ -0,0 +1,10 @@
+/gnulib-common.m4
+/gnulib-comp.m4
+/gnulib-tool.m4
+/include_next.m4
+/longlong.m4
+/multiarch.m4
+/onceonly.m4
+/stdint.m4
+/wchar.m4
+/wint_t.m4
diff --git a/m4/gnulib-cache.m4 b/m4/gnulib-cache.m4
new file mode 100644
index 0000000..e153a9d
--- /dev/null
+++ b/m4/gnulib-cache.m4
@@ -0,0 +1,35 @@
+# Copyright (C) 2002-2009 Free Software Foundation, Inc.
+#
+# This file is free software, distributed under the terms of the GNU
+# General Public License.  As a special exception to the GNU General
+# Public License, this file may be distributed as part of a program
+# that contains a configuration script generated by Autoconf, under
+# the same distribution terms as the rest of that program.
+#
+# Generated by gnulib-tool.
+#
+# This file represents the specification of how gnulib-tool is used.
+# It acts as a cache: It is written and read by gnulib-tool.
+# In projects using CVS, this file is meant to be stored in CVS,
+# like the configure.ac and various Makefile.am files.
+
+
+# Specification in the form of a command-line invocation:
+#   gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=. --libtool --macro-prefix=gl stdint
+
+# Specification in the form of a few gnulib-tool.m4 macro invocations:
+gl_LOCAL_DIR([])
+gl_MODULES([
+  stdint
+])
+gl_AVOID([])
+gl_SOURCE_BASE([lib])
+gl_M4_BASE([m4])
+gl_PO_BASE([])
+gl_DOC_BASE([doc])
+gl_TESTS_BASE([tests])
+gl_LIB([libgnu])
+gl_MAKEFILE_NAME([])
+gl_LIBTOOL
+gl_MACRO_PREFIX([gl])
+gl_PO_DOMAIN([])
-- 
1.8.3.1