summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorAkim Demaille <demaille@gostai.com>2009-07-01 11:53:29 +0200
committerAkim Demaille <demaille@gostai.com>2009-08-12 16:30:43 +0200
commitd1b55e811584638c9ebb7046e4017bba167bb072 (patch)
treed0cb699a93609754a4f7347929ea717e652b49d3 /configure.ac
parent838205d547498edd52c599e8755a233bb695e831 (diff)
downloadbison-d1b55e811584638c9ebb7046e4017bba167bb072.tar.gz
gnulib: improve prefixing.
* configure.ac (gl_PREFIXED_LIBOBJS): Don't rename it, rather, change the value of... (gl_LIBOBJS): this. Adjust more variables. * etc/prefix-gnulib-mk (prefix_assignment): Don't rename gl_LIBOBJS. (prefix): Also transform rules whose targets have slashes. Use $prefix liberally. Map @MKDIR_P@ to $(MKDIR_P). Prefix directories that are mkdir'd.
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac10
1 files changed, 6 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac
index 871b0df3..fa2a8e29 100644
--- a/configure.ac
+++ b/configure.ac
@@ -145,11 +145,13 @@ AC_SUBST([O0CXXFLAGS], [`echo $CXXFLAGS | sed 's/-O[[0-9]] *//'`])
gt_JAVACOMP([1.3], [1.4])
gt_JAVAEXEC
-AC_SUBST([gl_PREFIXED_LIBOBJS],
- [$(echo "$gl_LIBOBJS" | sed -e 's, , lib/,g')])
-for ac_var in ERRNO_H GETOPT_H INTTYPES_H STDBOOL_H STDINT_H WCHAR_H WCTYPE_H
+# We use gnulib, but from lib/local.mk instead of lib/Makefile.am.
+# So prefix paths with lib/. See also etc/prefix-gnulib-mk.
+gl_LIBOBJS=`echo "$gl_LIBOBJS" | sed -e 's, , lib/,g'`
+for ac_var in ALLOCA_H ERRNO_H FCNTL_H GETOPT_H INTTYPES_H \
+ STDBOOL_H STDINT_H SYS_WAIT_H WCHAR_H WCTYPE_H
do
- eval "$ac_var=lib/\$$ac_var"
+ eval "test 'x$ac_var' = x || $ac_var=lib/\$$ac_var"
done
AC_CONFIG_FILES([Makefile
po/Makefile.in