Simon Josefsson wrote:
> How would build-aux/ be substituted into $auxdir? Should gnulib-tool
> substitute 'build-aux/' in configure.ac:-statements to $auxdir?
I committed this patch.
2006-01-11 Bruno Haible <[EMAIL PROTECTED]>
* gnulib-tool (func_import, func_create_testdir): Replace build-aux
with $auxdir in AC_CONFIG_FILES statements.
*** gnulib-tool 10 Jan 2006 13:37:12 -0000 1.94
--- gnulib-tool 11 Jan 2006 12:22:41 -0000
***************
*** 1264,1273 ****
else
echo " AM_CONDITIONAL([GL_COND_LIBTOOL], [true])"
fi
for module in $modules; do
func_verify_module
if test -n "$module"; then
! func_get_autoconf_snippet "$module" | sed -e '/^$/d;' -e 's/^/ /' -e
's/AM_GNU_GETTEXT(\[external\])/dnl you must add AM_GNU_GETTEXT([external]) or
similar to configure.ac./'
if test "$module" = 'alloca' && test -n "$libtool"; then
echo 'changequote(,)dnl'
echo 'LTALLOCA=`echo "$ALLOCA" | sed '"'"'s/\.[^.]* /.lo
/g;s/\.[^.]*$/.lo/'"'"'`'
--- 1264,1283 ----
else
echo " AM_CONDITIONAL([GL_COND_LIBTOOL], [true])"
fi
+ sed_replace_build_aux='
+ :a
+ /AC_CONFIG_FILES(.*:build-aux\/.*)/{
+
s|AC_CONFIG_FILES(\(.*\):build-aux/\(.*\))|AC_CONFIG_FILES(\1:'"$auxdir"'/\2)|
+ ba
+ }'
+ sed_replace_build_aux=`echo "$sed_replace_build_aux" | sed -e 1d -e 's/^
*//'`
for module in $modules; do
func_verify_module
if test -n "$module"; then
! func_get_autoconf_snippet "$module" \
! | sed -e '/^$/d;' -e 's/^/ /' \
! -e 's/AM_GNU_GETTEXT(\[external\])/dnl you must add
AM_GNU_GETTEXT([external]) or similar to configure.ac./' \
! -e "$sed_replace_build_aux"
if test "$module" = 'alloca' && test -n "$libtool"; then
echo 'changequote(,)dnl'
echo 'LTALLOCA=`echo "$ALLOCA" | sed '"'"'s/\.[^.]* /.lo
/g;s/\.[^.]*$/.lo/'"'"'`'
***************
*** 1469,1487 ****
else
echo "AM_CONDITIONAL([GL_COND_LIBTOOL], [true])"
fi
# We don't have explicit ordering constraints between the various
# autoconf snippets. It's cleanest to put those of the library before
# those of the tests.
for module in $modules; do
func_verify_nontests_module
if test -n "$module"; then
! func_get_autoconf_snippet "$module"
fi
done
for module in $modules; do
func_verify_tests_module
if test -n "$module"; then
! func_get_autoconf_snippet "$module"
fi
done
echo
--- 1479,1506 ----
else
echo "AM_CONDITIONAL([GL_COND_LIBTOOL], [true])"
fi
+ sed_replace_build_aux='
+ :a
+ /AC_CONFIG_FILES(.*:build-aux\/.*)/{
+
s|AC_CONFIG_FILES(\(.*\):build-aux/\(.*\))|AC_CONFIG_FILES(\1:../'"$auxdir"'/\2)|
+ ba
+ }'
+ sed_replace_build_aux=`echo "$sed_replace_build_aux" | sed -e 1d -e 's/^
*//'`
# We don't have explicit ordering constraints between the various
# autoconf snippets. It's cleanest to put those of the library before
# those of the tests.
for module in $modules; do
func_verify_nontests_module
if test -n "$module"; then
! func_get_autoconf_snippet "$module" \
! | sed -e "$sed_replace_build_aux"
fi
done
for module in $modules; do
func_verify_tests_module
if test -n "$module"; then
! func_get_autoconf_snippet "$module" \
! | sed -e "$sed_replace_build_aux"
fi
done
echo
***************
*** 1533,1542 ****
else
echo "AM_CONDITIONAL([GL_COND_LIBTOOL], [true])"
fi
for module in $modules; do
func_verify_nontests_module
if test -n "$module"; then
! func_get_autoconf_snippet "$module"
fi
done
echo
--- 1552,1569 ----
else
echo "AM_CONDITIONAL([GL_COND_LIBTOOL], [true])"
fi
+ sed_replace_build_aux='
+ :a
+ /AC_CONFIG_FILES(.*:build-aux\/.*)/{
+
s|AC_CONFIG_FILES(\(.*\):build-aux/\(.*\))|AC_CONFIG_FILES(\1:'"$auxdir"'/\2)|
+ ba
+ }'
+ sed_replace_build_aux=`echo "$sed_replace_build_aux" | sed -e 1d -e 's/^
*//'`
for module in $modules; do
func_verify_nontests_module
if test -n "$module"; then
! func_get_autoconf_snippet "$module" \
! | sed -e "$sed_replace_build_aux"
fi
done
echo
_______________________________________________
bug-gnulib mailing list
bug-gnulib@gnu.org
http://lists.gnu.org/mailman/listinfo/bug-gnulib
