diff options
| -rwxr-xr-x | gl/build-aux/prefix-gnulib-mk | 3 | ||||
| -rw-r--r-- | gl/m4/non-recursive-gnulib-prefix-hack.m4 | 6 |
2 files changed, 8 insertions, 1 deletions
diff --git a/gl/build-aux/prefix-gnulib-mk b/gl/build-aux/prefix-gnulib-mk index cc74f51f9..38471a9c1 100755 --- a/gl/build-aux/prefix-gnulib-mk +++ b/gl/build-aux/prefix-gnulib-mk @@ -66,7 +66,8 @@ sub prefix_word ($) { local ($_) = @_; $_ = $prefix . $_ - unless /^-/ || m{^\$\(\w+\)} || $_ eq "Makefile" || $_ eq '\\'; + unless (/^-/ || m{^\$\(\w+\)} || $_ eq "Makefile" || $_ eq '\\' + || $_ eq '@ALLOCA@'); return $_; } diff --git a/gl/m4/non-recursive-gnulib-prefix-hack.m4 b/gl/m4/non-recursive-gnulib-prefix-hack.m4 index 3c5c48ed8..aeb0cc41f 100644 --- a/gl/m4/non-recursive-gnulib-prefix-hack.m4 +++ b/gl/m4/non-recursive-gnulib-prefix-hack.m4 @@ -9,6 +9,9 @@ dnl with a value ending in ".h" to reflect that these files are located dnl in the directory specified by LIB_DIR. AC_DEFUN([gl_NON_RECURSIVE_GNULIB_PREFIX_HACK], [ + # Tell AC_LIBSOURCES where to find source files like alloca.c. + AC_CONFIG_LIBOBJ_DIR([lib]) + # This hack originated in bison. It is required when using non-recursive # automake rules to build from gnulib-provided lib/ sources. Hence, LIB_DIR # is usually simply "lib". Those rules use the list of names like "fchdir.o" @@ -26,4 +29,7 @@ AC_DEFUN([gl_NON_RECURSIVE_GNULIB_PREFIX_HACK], (*_H:*.h) eval "$ac_var=$1/\$$ac_var";; esac done + + # If $ALLOCA is not empty, prefix its value with "lib/". + test -n "$ALLOCA" && ALLOCA="lib/$ALLOCA" ]) |