X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=rt%2Faclocal.m4;h=0e041b6e9949e82ce85c7a80fe3cd85c2b01d042;hb=666bacbcbeab98606a59a9a540c8e247f6203331;hp=9c6b64134d36eb7de0d251a9b672270064c8b898;hpb=8103c1fc1b2c27a6855feadf26f91b980a54bc52;p=freeside.git 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)