Added gnulib modules

6 files changed, 20 insertions, 4 deletions

diff --git a/config/include-Makefile.am b/config/include-Makefile.am
index b9caad5a..ad87c140 100644
--- a/config/include-Makefile.am
+++ b/config/include-Makefile.am
@@ -1,5 +1,6 @@
 AM_CPPFLAGS = -include $(top_builddir)/config.h -I$(top_srcdir)/include \
-	-DLOCALEDIR=\"$(localedir)\"
+	-DLOCALEDIR=\"$(localedir)\" \
+    -I$(top_builddir)/gnulib -I$(top_builddir)
 AM_CFLAGS = -fsigned-char
 AM_LDFLAGS =
 
diff --git a/getopt/Makefile.am b/getopt/Makefile.am
index bd3e7942..84ab98b1 100644
--- a/getopt/Makefile.am
+++ b/getopt/Makefile.am
@@ -7,5 +7,7 @@ exampledir = $(datadir)/getopt/
 dist_example_SCRIPTS = getopt-parse.bash getopt-parse.tcsh \
 	getopt-test.bash getopt-test.tcsh
 
+getopt_LDADD = -L$(top_builddir)/gnulib -lgnu
+
 EXTRA_DIST = README Changelog COPYING
 
diff --git a/gnulib/.gitignore b/gnulib/.gitignore
index 2c6b449b..1d5b8e81 100644
--- a/gnulib/.gitignore
+++ b/gnulib/.gitignore
@@ -73,3 +73,10 @@
 /vsnprintf.c
 /wchar.in.h
 /xsize.h
+/signal.in.h
+/flock.c
+/msvc-inval.c
+/msvc-inval.h
+/msvc-nothrow.c
+/msvc-nothrow.h
+/sys_file.in.h
diff --git a/gnulib/m4/.gitignore b/gnulib/m4/.gitignore
index 9700e381..ab6c5758 100644
--- a/gnulib/m4/.gitignore
+++ b/gnulib/m4/.gitignore
@@ -53,3 +53,8 @@
 /wchar_h.m4
 /wint_t.m4
 /xsize.m4
+/signal_h.m4
+/flock.m4
+/msvc-inval.m4
+/msvc-nothrow.m4
+/sys_file_h.m4
diff --git a/gnulib/m4/gnulib-cache.m4 b/gnulib/m4/gnulib-cache.m4
index 3b83d945..c7af8eb4 100644
--- a/gnulib/m4/gnulib-cache.m4
+++ b/gnulib/m4/gnulib-cache.m4
@@ -27,16 +27,18 @@
 
 
 # Specification in the form of a command-line invocation:
-#   gnulib-tool --import --dir=. --lib=libgnu --source-base=gnulib --m4-base=gnulib/m4 --po-base=gnulib/po --doc-base=gnulib/doc --tests-base=gnulib/tests --aux-dir=config --no-conditional-dependencies --no-libtool --macro-prefix=gl --po-domain=ul-gnulib argp mempcpy memrchr progname rawmemchr
+#   gnulib-tool --import --dir=. --lib=libgnu --source-base=gnulib --m4-base=gnulib/m4 --po-base=gnulib/po --doc-base=gnulib/doc --tests-base=gnulib/tests --aux-dir=config --no-conditional-dependencies --no-libtool --macro-prefix=gl --po-domain=ul argp flock mempcpy memrchr progname rawmemchr signal
 
 # Specification in the form of a few gnulib-tool.m4 macro invocations:
 gl_LOCAL_DIR([])
 gl_MODULES([
   argp
+  flock
   mempcpy
   memrchr
   progname
   rawmemchr
+  signal
 ])
 gl_AVOID([])
 gl_SOURCE_BASE([gnulib])
@@ -47,5 +49,5 @@ gl_TESTS_BASE([gnulib/tests])
 gl_LIB([libgnu])
 gl_MAKEFILE_NAME([])
 gl_MACRO_PREFIX([gl])
-gl_PO_DOMAIN([ul-gnulib])
+gl_PO_DOMAIN([ul])
 gl_WITNESS_C_DOMAIN([])
diff --git a/misc-utils/Makefile.am b/misc-utils/Makefile.am
index 39887027..cb770e05 100644
--- a/misc-utils/Makefile.am
+++ b/misc-utils/Makefile.am
@@ -11,7 +11,6 @@ usrbin_exec_PROGRAMS = cal ddate logger look mcookie \
 EXTRA_DIST += README.cal README.ddate README.namei README.namei2
 
 mcookie_SOURCES = mcookie.c $(top_srcdir)/lib/md5.c
-script_LDADD =
 
 usrbin_exec_SCRIPTS = chkdupexe