From bf8486051c22115173fc138f95d02221c5ec8806 Mon Sep 17 00:00:00 2001 From: "Gary V. Vaughan" Date: Sun, 22 Sep 2013 11:56:05 +0700 Subject: configury: install gnulib sources into m4 subdirectory. * configure.ac (AC_CONFIG_LIBOBJ_DIR): Change to m4/gnu. (AC_CONFIG_HEADERS): Change to config.h. (AC_CONFIG_FILES): Change gnu/Makeflie to m4/gnu/Makefile. * .gitignore, po/POTFILES.in: Adjust accordingly. * build-aux/m4/gnulib-cache.m4: Regenerate. Signed-off-by: Gary V. Vaughan --- .gitignore | 56 ++------------------------------------------ Makefile.am | 8 +++---- build-aux/m4/gnulib-cache.m4 | 4 ++-- configure.ac | 6 ++--- po/POTFILES.in | 21 ++++++++--------- 5 files changed, 21 insertions(+), 74 deletions(-) diff --git a/.gitignore b/.gitignore index 658005a6..18c2027d 100644 --- a/.gitignore +++ b/.gitignore @@ -33,7 +33,7 @@ build-aux/ /ChangeLog /config.cache /config.h -/config-h.in +/config.h.in /config.log /config.status /configure @@ -48,63 +48,11 @@ CVS /doc/manual /doc/stamp-vti /doc/version.texi -/gnu /GNUmakefile /INSTALL -/intl libtool -/ltdl/argz.c -/ltdl/argz_.h -/ltdl/argz.h -/ltdl/config -/ltdl/COPYING.LIB -/ltdl/libltdl -/ltdl/loaders -/ltdl/lt*.[ch] -/ltdl/m4/.gitignore -/ltdl/m4/argz.m4 -/ltdl/m4/codeset.m4 -/ltdl/m4/getopt.m4 -/ltdl/m4/gettext.m4 -/ltdl/m4/glibc2.m4 -/ltdl/m4/glibc21.m4 -/ltdl/m4/iconv.m4 -/ltdl/m4/intdiv0.m4 -/ltdl/m4/intl.m4 -/ltdl/m4/intldir.m4 -/ltdl/m4/intmax.m4 -/ltdl/m4/inttypes-pri.m4 -/ltdl/m4/inttypes_h.m4 -/ltdl/m4/lcmessage.m4 -/ltdl/m4/lib-ld.m4 -/ltdl/m4/lib-link.m4 -/ltdl/m4/lib-prefix.m4 -/ltdl/m4/libtool.m4 -/ltdl/m4/lock.m4 -/ltdl/m4/longdouble.m4 -/ltdl/m4/longlong.m4 -/ltdl/m4/ltdl.m4 -/ltdl/m4/ltoptions.m4 -/ltdl/m4/ltsugar.m4 -/ltdl/m4/ltversion.m4 -/ltdl/m4/lt~obsolete.m4 -/ltdl/m4/nls.m4 -/ltdl/m4/po.m4 -/ltdl/m4/printf-posix.m4 -/ltdl/m4/progtest.m4 -/ltdl/m4/size_max.m4 -/ltdl/m4/stdint_h.m4 -/ltdl/m4/uintmax_t.m4 -/ltdl/m4/ulonglong.m4 -/ltdl/m4/version-etc.m4 -/ltdl/m4/visibility.m4 -/ltdl/m4/wchar_t.m4 -/ltdl/m4/wint_t.m4 -/ltdl/m4/xsize.m4 -/ltdl/m4/xstrtol.m4 -/ltdl/README -/ltdl/slist.c /m4-* +/m4/gnu /m4/obstack.h /m4/pathconf.h /m4/system.h diff --git a/Makefile.am b/Makefile.am index 6c853c5f..3867254f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -23,7 +23,7 @@ config_aux_dir = build-aux config_macro_dir= $(config_aux_dir)/m4 -SUBDIRS = po gnu . doc tests/gnu +SUBDIRS = po m4/gnu . doc tests/gnu ACLOCAL_AMFLAGS = -I build-aux/m4 AUTOMAKE_OPTIONS = nostdinc @@ -55,7 +55,7 @@ EXTRA_LTLIBRARIES= # Additional configuration. Version management comes from suggestions # given in build-aux/git-version-gen. -AM_CPPFLAGS += -Ignu -I$(srcdir)/gnu \ +AM_CPPFLAGS += -Im4/gnu -I$(srcdir)/m4/gnu \ -Im4 -I$(srcdir)/m4 EXTRA_DIST += bootstrap cfg.mk maint.mk .version .prev-version \ $(config_macro_dir)/gnulib-cache.m4 $(gitlog_to_changelog) @@ -235,9 +235,9 @@ m4_libm4_la_SOURCES = \ m4/symtab.c \ m4/syntax.c \ m4/utility.c -m4_libm4_la_LIBADD = gnu/libgnu.la \ +m4_libm4_la_LIBADD = m4/gnu/libgnu.la \ $(LIBLTDL) $(LTLIBINTL) $(LIBADD_DL) -m4_libm4_la_DEPENDENCIES = $(LTDLDEPS) gnu/libgnu.la +m4_libm4_la_DEPENDENCIES = $(LTDLDEPS) m4/gnu/libgnu.la # This file needs to be regenerated at configure time. dist-hook: diff --git a/build-aux/m4/gnulib-cache.m4 b/build-aux/m4/gnulib-cache.m4 index 6ac73fb1..a31e5666 100644 --- a/build-aux/m4/gnulib-cache.m4 +++ b/build-aux/m4/gnulib-cache.m4 @@ -27,7 +27,7 @@ # Specification in the form of a command-line invocation: -# gnulib-tool --import --dir=. --local-dir=build-aux/gl --lib=libgnu --source-base=gnu --m4-base=build-aux/m4 --doc-base=doc --tests-base=tests/gnu --aux-dir=build-aux --with-tests --with-c++-tests --no-conditional-dependencies --libtool --macro-prefix=M4 assert autobuild avltree-oset binary-io bitrotate clean-temp cloexec close-stream closein config-h configmake dirname error execute fclose fdl-1.3 fflush filenamecat flexmember fopen fopen-safer freadptr freadseek fseeko gendocs gettext git-version-gen gitlog-to-changelog gnumakefile gnupload gpl-3.0 intprops inttypes maintainer-makefile manywarnings memchr2 memcmp2 memmem mkstemp obstack obstack-printf-posix progname propername quote regex regexprops-generic rename setenv sigpipe snprintf-posix spawn-pipe sprintf-posix stdbool stdlib-safer strnlen strtod tempname unlocked-io unsetenv update-copyright vasnprintf-posix verify verror wait-process xalloc xalloc-die xmemdup0 xoset xprintf-posix xstrndup xvasprintf-posix +# gnulib-tool --import --dir=. --local-dir=build-aux/gl --lib=libgnu --source-base=m4/gnu --m4-base=build-aux/m4 --doc-base=doc --tests-base=tests/gnu --aux-dir=build-aux --with-tests --with-c++-tests --no-conditional-dependencies --libtool --macro-prefix=M4 assert autobuild avltree-oset binary-io bitrotate clean-temp cloexec close-stream closein config-h configmake dirname error execute fclose fdl-1.3 fflush filenamecat flexmember fopen fopen-safer freadptr freadseek fseeko gendocs gettext git-version-gen gitlog-to-changelog gnumakefile gnupload gpl-3.0 intprops inttypes maintainer-makefile manywarnings memchr2 memcmp2 memmem mkstemp obstack obstack-printf-posix progname propername quote regex regexprops-generic rename setenv sigpipe snprintf-posix spawn-pipe sprintf-posix stdbool stdlib-safer strnlen strtod tempname unlocked-io unsetenv update-copyright vasnprintf-posix verify verror wait-process xalloc xalloc-die xmemdup0 xoset xprintf-posix xstrndup xvasprintf-posix # Specification in the form of a few gnulib-tool.m4 macro invocations: gl_LOCAL_DIR([build-aux/gl]) @@ -106,7 +106,7 @@ gl_MODULES([ ]) gl_WITH_CXX_TESTS gl_AVOID([]) -gl_SOURCE_BASE([gnu]) +gl_SOURCE_BASE([m4/gnu]) gl_M4_BASE([build-aux/m4]) gl_PO_BASE([]) gl_DOC_BASE([doc]) diff --git a/configure.ac b/configure.ac index 36e0a7fd..70f39ae8 100644 --- a/configure.ac +++ b/configure.ac @@ -32,9 +32,9 @@ AC_INIT([GNU M4], m4_defn([M4_VERSION]), [bug-m4@gnu.org]) AC_CONFIG_SRCDIR([src/m4.h]) AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_MACRO_DIR([build-aux/m4]) -AC_CONFIG_LIBOBJ_DIR([gnu]) +AC_CONFIG_LIBOBJ_DIR([m4/gnu]) AC_CONFIG_TESTDIR([tests]) -AC_CONFIG_HEADERS([gnu/config.h:gnu/config.hin]) +AC_CONFIG_HEADERS([config.h]) AC_CONFIG_FILES([tests/m4], [chmod +x tests/m4]) @@ -280,8 +280,8 @@ M4_SYSCMD ## -------- ## AC_CONFIG_FILES([ Makefile -gnu/Makefile doc/Makefile +m4/gnu/Makefile m4/system.h:m4/system_.h tests/atlocal tests/gnu/Makefile diff --git a/po/POTFILES.in b/po/POTFILES.in index 0109259a..cb3767f5 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,15 +1,15 @@ -gnu/clean-temp.c -gnu/closein.c -gnu/closeout.c -gnu/error.c -gnu/obstack.c -gnu/quotearg.c -gnu/regcomp.c -gnu/verror.c -gnu/xalloc-die.c -gnu/xprintf.c m4/builtin.c m4/debug.c +m4/gnu/clean-temp.c +m4/gnu/closein.c +m4/gnu/closeout.c +m4/gnu/error.c +m4/gnu/obstack.c +m4/gnu/quotearg.c +m4/gnu/regcomp.c +m4/gnu/verror.c +m4/gnu/xalloc-die.c +m4/gnu/xprintf.c m4/input.c m4/macro.c m4/module.c @@ -20,7 +20,6 @@ m4/utility.c modules/evalparse.c modules/format.c modules/gnu.c -modules/load.c modules/m4.c modules/mpeval.c modules/traditional.c -- cgit v1.2.1