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)
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
s/\s+$/\n/gim;
s/\+$/\/rt3/gim;
# m4 will not let us just use $1, we need @S|@1
- s/^\s*((?:bin|sbin|libexec|data|sysconf|sharedstate|localstate|lib|include|oldinclude|info|man)dir)\s*:\s*(.*)$/@S|@1=@S|@2/gim;
+ s/^\s*((?:bin|sbin|libexec|data|sysconf|sharedstate|localstate|lib|include|oldinclude|info|man|html)dir)\s*:\s*(.*)$/@S|@1=@S|@2/gim;
s/^\s*(.*?)\s*:\s*(.*)$/\(test "x\@S|@@S|@1" = "xNONE" || test "x\@S|@@S|@1" = "x") && @S|@1=@S|@2/gim;
' < $1 > $pldconf
. $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 |
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)