diff options
| author | ivan <ivan> | 2009-12-31 13:16:41 +0000 |
|---|---|---|
| committer | ivan <ivan> | 2009-12-31 13:16:41 +0000 |
| commit | b4b0c7e72d7eaee2fbfc7022022c9698323203dd (patch) | |
| tree | ba4cd21399e412c32fe3737eaa8478e3271509f9 /rt/aclocal.m4 | |
| parent | 2dfda73eeb3eae2d4f894099754794ef07d060dd (diff) | |
import rt 3.8.7
Diffstat (limited to 'rt/aclocal.m4')
| -rw-r--r-- | rt/aclocal.m4 | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/rt/aclocal.m4 b/rt/aclocal.m4 index 9c6b64134..0e041b6e9 100644 --- a/rt/aclocal.m4 +++ b/rt/aclocal.m4 @@ -26,11 +26,11 @@ dnl AC_DEFUN([RT_ENABLE_LAYOUT],[ AC_ARG_ENABLE(layout, AC_HELP_STRING([--enable-layout=LAYOUT], - [Use a specific directory layout (Default: RT3)]), + [Use a specific directory layout (Default: relative)]), LAYOUT=$enableval) if test "x$LAYOUT" = "x"; then - LAYOUT="RT3" + LAYOUT="relative" fi RT_LAYOUT($srcdir/config.layout, $LAYOUT) AC_MSG_CHECKING(for chosen layout) @@ -45,6 +45,11 @@ else AC_SUBST(rt_layout_name) AC_MSG_RESULT($rt_layout_name) fi +if test "x$rt_layout_name" != "xinplace" ; then + AC_SUBST([COMMENT_INPLACE_LAYOUT], [""]) +else + AC_SUBST([COMMENT_INPLACE_LAYOUT], [# ]) +fi ]) dnl @@ -111,6 +116,7 @@ AC_DEFUN([RT_LAYOUT],[ RT_SUBST_EXPANDED_ARG(datadir) RT_SUBST_EXPANDED_ARG(htmldir) RT_SUBST_EXPANDED_ARG(manualdir) + RT_SUBST_EXPANDED_ARG(plugindir) RT_SUBST_EXPANDED_ARG(localstatedir) RT_SUBST_EXPANDED_ARG(logfiledir) RT_SUBST_EXPANDED_ARG(masonstatedir) |