X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=rt%2Faclocal.m4;h=d427e135669b99731f97635d4708ca23c3fde5cc;hb=refs%2Fheads%2Frt_28256;hp=9c6b64134d36eb7de0d251a9b672270064c8b898;hpb=ef20b2b6b1feb47ad02b5ff7525f1a0fd11d0fa4;p=freeside.git

diff --git a/rt/aclocal.m4 b/rt/aclocal.m4
index 9c6b64134..d427e1356 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
@@ -85,10 +90,10 @@ AC_DEFUN([RT_LAYOUT],[
 			. $pldconf
 			changequote({,})
 			for var in prefix exec_prefix bindir sbindir \
-				 sysconfdir mandir libdir datadir htmldir \
-				 localstatedir logfiledir masonstatedir \
+				 sysconfdir mandir libdir datadir htmldir fontdir\
+				 lexdir localstatedir logfiledir masonstatedir \
 				 sessionstatedir customdir custometcdir customhtmldir \
-				 customlexdir customlibdir manualdir; do
+				 customlexdir customplugindir customlibdir manualdir; do
 				eval "val=\"\$$var\""
 				val=`echo $val | sed -e 's:\(.\)/*$:\1:'`
 				val=`echo $val | 
@@ -108,15 +113,19 @@ AC_DEFUN([RT_LAYOUT],[
 	RT_SUBST_EXPANDED_ARG(sysconfdir)
 	RT_SUBST_EXPANDED_ARG(mandir)
 	RT_SUBST_EXPANDED_ARG(libdir)
+	RT_SUBST_EXPANDED_ARG(lexdir)
 	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)
 	RT_SUBST_EXPANDED_ARG(sessionstatedir)
 	RT_SUBST_EXPANDED_ARG(customdir)
 	RT_SUBST_EXPANDED_ARG(custometcdir)
+	RT_SUBST_EXPANDED_ARG(customplugindir)
 	RT_SUBST_EXPANDED_ARG(customhtmldir)
 	RT_SUBST_EXPANDED_ARG(customlexdir)
 	RT_SUBST_EXPANDED_ARG(customlibdir)