[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 2/3] maint: rename `libltdl/m4' directory to standard `m4'.
From: |
Gary V. Vaughan |
Subject: |
[PATCH 2/3] maint: rename `libltdl/m4' directory to standard `m4'. |
Date: |
Tue, 1 Nov 2011 21:22:06 +0700 |
Similarly to 1/3, full compressed patch attached. 72 hours etc etc.
* bootstrap.conf (libtool_link_libltdl_subdirs): Add `m4'.
* cfg.mk (exclude_file_name_regexp--sc_prohibit_test_minus_ao):
Adjust path.
* configure.ac (AC_CONFIG_MACRO_DIR): Adjust.
* libltdl/m4: Moved to it's parent directory.
* tests/cdemo/Makefile.am, tests/demo/Makefile.am,
tests/depdemo/Makefile.am, tests/f77demo/Makefile.am,
tests/fcdemo/Makefile.am, tests/mdemo/Makefile.am,
tests/mdemo2/Makefile.am, tests/pdemo/Makefile.am,
tests/tagdemo/Makefile.am (ACLOCAL_AMFLAGS): Use new location
of macro_dir.
* libtoolize.m4sh: Ditto.
Signed-off-by: Gary V. Vaughan <address@hidden>
---
Makefile.am | 4 +-
bootstrap.conf | 6 +
configure.ac | 2 +-
libltdl/.gitignore | 3 +-
libltdl/m4/.gitignore | 6 -
libltdl/m4/argz.m4 | 79 -
libltdl/m4/autobuild.m4 | 40 -
libltdl/m4/libtool.m4 | 7981 ---------------------------------------------
libltdl/m4/ltdl.m4 | 817 -----
libltdl/m4/ltoptions.m4 | 384 ---
libltdl/m4/ltsugar.m4 | 123 -
libltdl/m4/ltversion.in | 23 -
libltdl/m4/lt~obsolete.m4 | 98 -
libtoolize.m4sh | 2 +-
m4/.gitignore | 6 +
m4/argz.m4 | 79 +
m4/autobuild.m4 | 40 +
m4/libtool.m4 | 7981 +++++++++++++++++++++++++++++++++++++++++++++
m4/ltdl.m4 | 817 +++++
m4/ltoptions.m4 | 384 +++
m4/ltsugar.m4 | 123 +
m4/ltversion.in | 23 +
m4/lt~obsolete.m4 | 98 +
tests/cdemo/Makefile.am | 2 +-
tests/demo/Makefile.am | 2 +-
tests/depdemo/Makefile.am | 2 +-
tests/f77demo/Makefile.am | 2 +-
tests/fcdemo/Makefile.am | 2 +-
tests/mdemo/Makefile.am | 2 +-
tests/mdemo2/Makefile.am | 2 +-
tests/pdemo/Makefile.am | 2 +-
tests/tagdemo/Makefile.am | 2 +-
32 files changed, 9571 insertions(+), 9566 deletions(-)
delete mode 100644 libltdl/m4/.gitignore
delete mode 100644 libltdl/m4/argz.m4
delete mode 100644 libltdl/m4/autobuild.m4
delete mode 100644 libltdl/m4/libtool.m4
delete mode 100644 libltdl/m4/ltdl.m4
delete mode 100644 libltdl/m4/ltoptions.m4
delete mode 100644 libltdl/m4/ltsugar.m4
delete mode 100644 libltdl/m4/ltversion.in
delete mode 100644 libltdl/m4/lt~obsolete.m4
create mode 100644 m4/.gitignore
create mode 100644 m4/argz.m4
create mode 100644 m4/autobuild.m4
create mode 100644 m4/libtool.m4
create mode 100644 m4/ltdl.m4
create mode 100644 m4/ltoptions.m4
create mode 100644 m4/ltsugar.m4
create mode 100644 m4/ltversion.in
create mode 100644 m4/lt~obsolete.m4
diff --git a/Makefile.am b/Makefile.am
index db98870..890e4ae 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -23,7 +23,7 @@
## 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#####
-ACLOCAL_AMFLAGS = -I libltdl/m4
+ACLOCAL_AMFLAGS = -I m4
AM_CPPFLAGS =
AM_LDFLAGS =
@@ -670,7 +670,7 @@ TESTS_ENVIRONMENT = MAKE="$(MAKE)" CC="$(CC)"
CFLAGS="$(CFLAGS)" \
BUILDCHECK_ENVIRONMENT = _lt_pkgdatadir="$(abs_top_srcdir)" \
LIBTOOLIZE="$(abs_top_builddir)/libtoolize" \
LIBTOOL="$(abs_top_builddir)/libtool" \
- tst_aclocaldir="$(abs_top_srcdir)/libltdl/m4"
+ tst_aclocaldir="$(abs_top_srcdir)/m4"
INSTALLCHECK_ENVIRONMENT = \
LIBTOOLIZE="$(bindir)/`echo libtoolize |$(SED)
'$(program_transform_name)'`" \
diff --git a/bootstrap.conf b/bootstrap.conf
index 2909d30..ebdb293 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -353,6 +353,7 @@ libtool_link_libltdl_subdirs ()
$debug_cmd
$require_build_aux
+ $require_macro_dir
$require_pkgaux_scripts
my_pkgaux_files="$pkgaux_scripts $build_aux/ltmain.sh"
@@ -372,6 +373,11 @@ libtool_link_libltdl_subdirs ()
for my_file in $my_pkgaux_files; do
ln -s "../../$my_file" "libltdl/$my_file"
done
+
+ # Macro directory is identical, so link the directory.
+ func_verbose "creating libltdl/$macro_dir"
+ rm -f "libltdl/$macro_dir" || exit 1
+ ln -s "../$macro_dir" "libltdl/$macro_dir"
}
func_add_hook func_gnulib_tool libtool_link_libltdl_subdirs
diff --git a/configure.ac b/configure.ac
index 0660b65..49a4c30 100644
--- a/configure.ac
+++ b/configure.ac
@@ -52,7 +52,7 @@ AC_CONFIG_HEADERS([config.h:config-h.in])
AC_CONFIG_SRCDIR([libtoolize.m4sh])
LT_CONFIG_LTDL_DIR([libltdl], [nonrecursive])
AC_CONFIG_AUX_DIR([build-aux])
-AC_CONFIG_MACRO_DIR([libltdl/m4])
+AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_LIBOBJ_DIR([libltdl])
package_revision=`$SHELL $ac_aux_dir/git-version-gen .tarball-version`
diff --git a/libltdl/.gitignore b/libltdl/.gitignore
index 2f39096..5795dbc 100644
--- a/libltdl/.gitignore
+++ b/libltdl/.gitignore
@@ -2,5 +2,4 @@
/Makefile.am
/argz.h
/build-aux
-/dummy.c
-/gnulib.mk
+/m4
diff --git a/libltdl/m4/.gitignore b/libltdl/m4/.gitignore
deleted file mode 100644
index 1facea7..0000000
--- a/libltdl/m4/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-/00gnulib.m4
-/gnulib-cache.m4
-/gnulib-common.m4
-/gnulib-comp.m4
-/gnulib-tool.m4
-/ltversion.m4
Cheers,
--
Gary V. Vaughan (gary AT gnu DOT org)
0002-maint-rename-libltdl-m4-directory-to-standard-m4.patch.xz
Description: application/xz
- [PATCH 2/3] maint: rename `libltdl/m4' directory to standard `m4'.,
Gary V. Vaughan <=