kc3-lang/automake/t/subpkg-macrodir.sh

• Show log

  Commit

• Hash : 326cd5f0
  Author :
  Date : 2012-11-14T16:54:38
  

  aclocal: tracing AC_CONFIG_MACRO_DIRS can work with older autoconf as well
  
  This will allow our users to interact also with pre-2.70 autoconf without
  need for the user to add ACLOCAL_AMFLAGS in Makefile.am.  For example,
  before this change, in order to have aclocal look for macros in 'm4/dir1'
  and 'm4/dir2' also when (say) autoconf 2.69 was used, our users would
  have had to add something like:
  
      ACLOCAL_AMFLAGS = -I m4/dir1 -I m4/dir2
  
  in Makefile.am, in addition to the
  
      AC_CONFIG_MACRO_DIRS([m4/dir1 m4/dir2])
  
  in configure.ac.  Now, the AC_CONFIG_MACRO_DIRS call is enough.
  
  See the long-winded discussion on automake bug#12845 for more details:
  <http://debbugs.gnu.org/cgi/bugreport.cgi?bug=12845>
  
  * aclocal.in ($ac_config_macro_dirs_fallback): New global variable,
  contains m4 code to issue a fallback definition of AC_CONFIG_MACRO_DIRS
  as an alias for the private macro _AM_CONFIG_MACRO_DIRS.
  (trace_used_macros): Handle and trace that macro.  Do some code
  reorganization and fix related botched indentation while at it.
  (write_aclocal): Output '$ac_config_macro_dirs_fallback' early in
  the generated aclocal.m4.
  * t/aclocal-macrodirs.tap: Run unconditionally, even with older
  autoconf.
  * t/subpkg-macrodir.sh: Likewise.
  * doc/automake.texi: Document only AC_CONFIG_MACRO_DIRS, rather
  than AC_CONFIG_MACRO_DIR.
  
  Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
  

Download

• t/subpkg-macrodir.sh

• #! /bin/sh
  # Copyright (C) 2002-2012 Free Software Foundation, Inc.
  #
  # This program is free software; you can redistribute it and/or modify
  # it under the terms of the GNU General Public License as published by
  # the Free Software Foundation; either version 2, or (at your option)
  # any later version.
  #
  # This program is distributed in the hope that it will be useful,
  # but WITHOUT ANY WARRANTY; without even the implied warranty of
  # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  # GNU General Public License for more details.
  #
  # You should have received a copy of the GNU General Public License
  # along with this program.  If not, see <http://www.gnu.org/licenses/>.
  
  # Subpackages that want to use m4 macros from their superpackages,
  # with AC_CONFIG_MACRO_DIRS.
  
  . test-init.sh
  
  cat > configure.ac <<'END'
  AC_INIT([super], [1.0])
  AM_INIT_AUTOMAKE
  AC_CONFIG_MACRO_DIR([m4])
  AC_CONFIG_SUBDIRS([pkg])
  AX_BAR
  AX_FOO
  END
  
  mkdir m4
  
  cat > m4/foo.m4 <<'EOF'
  AC_DEFUN([AX_FOO], [
    AC_CONFIG_FILES([Makefile])
    AC_OUTPUT
  ])
  EOF
  
  cat > m4/bar.m4 <<'EOF'
  AC_DEFUN([AX_BAR], [AC_SUBST([WHOMAI], [SuperPkg])])
  EOF
  
  cat > Makefile.am << 'END'
  test-whomai:
  	test '$(WHOAMI)' = SuperPkg
  check-local: test
  .PHONY: test
  END
  
  mkdir pkg
  
  cat > pkg/configure.ac <<'END'
  AC_INIT([super], [1.0])
  AM_INIT_AUTOMAKE
  AC_CONFIG_MACRO_DIRS([macros ../m4])
  AX_BAR
  AX_FOO
  END
  
  mkdir pkg/macros
  cat > pkg/macros/zardoz.m4 << 'END'
  AC_DEFUN([AX_BAR], [AC_SUBST([WHOMAI], [sub-pkg])])
  END
  
  cat > pkg/Makefile.am << 'END'
  test-whomai:
  	test '$(WHOAMI)' = sub-pkg
  check-local: test
  .PHONY: test
  END
  
  AUTOMAKE=$AUTOMAKE ACLOCAL=$ACLOCAL AUTOCONF=$AUTOCONF $AUTORECONF -vi
  
  $FGREP 'm4_include([m4/foo.m4])' aclocal.m4
  $FGREP 'm4_include([m4/bar.m4])' aclocal.m4
  $FGREP 'm4_include([../m4/foo.m4])' pkg/aclocal.m4
  $FGREP 'm4_include([macros/zardoz.m4])' pkg/aclocal.m4
  
  ./configure
  
  $MAKE test
  (cd pkg && $MAKE test) || exit 1
  
  $MAKE distcheck
  
  :
  

Download