fix 'Can't call method "setup" on an undefined value' error when using into rates...

[freeside.git] / rt / aclocal.m4

diff --git a/rt/aclocal.m4 b/rt/aclocal.m4
index 9c6b641..044af5a 100644 (file)
--- 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
@@ -85,7 +90,7 @@ AC_DEFUN([RT_LAYOUT],[
                        . $pldconf
                        changequote({,})
                        for var in prefix exec_prefix bindir sbindir \
-                                sysconfdir mandir libdir datadir htmldir \
+                                sysconfdir mandir libdir datadir htmldir fontdir\
                                 localstatedir logfiledir masonstatedir \
                                 sessionstatedir customdir custometcdir customhtmldir \
                                 customlexdir customlibdir manualdir; do
@@ -110,7 +115,9 @@ AC_DEFUN([RT_LAYOUT],[
        RT_SUBST_EXPANDED_ARG(libdir)
        RT_SUBST_EXPANDED_ARG(datadir)
        RT_SUBST_EXPANDED_ARG(htmldir)
+       RT_SUBST_EXPANDED_ARG(fontdir)
        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)