Mercurial > hg > octave-nkf > gnulib-hg

comparison gnulib-tool @ 16122:e3e8e2fc21a9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix conflict between two instantiations of module 'unistd'. * gnulib-tool (func_emit_autoconf_snippet): Substitute ${include_guard_prefix} also in the autoconf snippet. * m4/getopt.m4 (gl_FUNC_GETOPT_POSIX): Don't set GNULIB_UNISTD_H_GETOPT. * m4/unistd_h.m4 (gl_UNISTD_H_DEFAULTS): Don't initialize GNULIB_UNISTD_H_GETOPT. * modules/getopt-posix (configure.ac): Set the GNULIB_${gl_include_guard_prefix}_UNISTD_H_GETOPT variable. * modules/getopt-gnu (configure.ac): Likewise. * modules/unistd (Makefile.am): Change the substitution value of GNULIB_UNISTD_H_GETOPT to depend on the include guard prefix. Reported by Simon Josefsson.
author Bruno Haible <bruno@clisp.org>
date Sat, 26 Nov 2011 21:08:25 +0100
parents d3633bf8b61d
children 04717ea7c365
comparison
equal deleted inserted replaced
16121:d2f39a0d2549 16122:e3e8e2fc21a9
3850 # emits the autoconf snippet of a module. 3850 # emits the autoconf snippet of a module.
3851 # Input: 3851 # Input:
3852 # - local_gnulib_dir from --local-dir 3852 # - local_gnulib_dir from --local-dir
3853 # - modcache true or false, from --cache-modules/--no-cache-modules 3853 # - modcache true or false, from --cache-modules/--no-cache-modules
3854 # - sed_replace_build_aux sed expression that replaces reference to build-aux 3854 # - sed_replace_build_aux sed expression that replaces reference to build-aux
3855 # - sed_replace_include_guard_prefix
3856 # sed expression for resolving ${gl_include_guard_prefix}
3855 # - module the module name 3857 # - module the module name
3856 # - toplevel true or false. 'false' means a subordinate use of 3858 # - toplevel true or false. 'false' means a subordinate use of
3857 # gnulib-tool. 3859 # gnulib-tool.
3858 # - disable_libtool true or false. It tells whether to disable libtool 3860 # - disable_libtool true or false. It tells whether to disable libtool
3859 # handling even if it has been specified through the 3861 # handling even if it has been specified through the
3872 esac 3874 esac
3873 }; then 3875 }; then
3874 func_get_autoconf_snippet "$module" \ 3876 func_get_autoconf_snippet "$module" \
3875 | sed -e '/^$/d;' -e "s/^/$indentation/" \ 3877 | sed -e '/^$/d;' -e "s/^/$indentation/" \
3876 -e "$sed_replace_build_aux" \ 3878 -e "$sed_replace_build_aux" \
3879 -e "$sed_replace_include_guard_prefix" \
3877 | { if $disable_libtool; then 3880 | { if $disable_libtool; then
3878 sed -e 's/\$gl_cond_libtool/false/g' \ 3881 sed -e 's/\$gl_cond_libtool/false/g' \
3879 -e 's/gl_libdeps/gltests_libdeps/g' \ 3882 -e 's/gl_libdeps/gltests_libdeps/g' \
3880 -e 's/gl_ltlibdeps/gltests_ltlibdeps/g' 3883 -e 's/gl_ltlibdeps/gltests_ltlibdeps/g'
3881 else 3884 else
3901 # collects and emit the autoconf snippets of a set of modules. 3904 # collects and emit the autoconf snippets of a set of modules.
3902 # Input: 3905 # Input:
3903 # - local_gnulib_dir from --local-dir 3906 # - local_gnulib_dir from --local-dir
3904 # - modcache true or false, from --cache-modules/--no-cache-modules 3907 # - modcache true or false, from --cache-modules/--no-cache-modules
3905 # - sed_replace_build_aux sed expression that replaces reference to build-aux 3908 # - sed_replace_build_aux sed expression that replaces reference to build-aux
3909 # - sed_replace_include_guard_prefix
3910 # sed expression for resolving ${gl_include_guard_prefix}
3906 # - modules the list of modules. 3911 # - modules the list of modules.
3907 # - verifier one of func_verify_module, func_verify_nontests_module, 3912 # - verifier one of func_verify_module, func_verify_nontests_module,
3908 # func_verify_tests_module. It selects the subset of 3913 # func_verify_tests_module. It selects the subset of
3909 # $modules to consider. 3914 # $modules to consider.
3910 # - toplevel true or false. 'false' means a subordinate use of 3915 # - toplevel true or false. 'false' means a subordinate use of