projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Updated for 2.1.2
[freeside.git]
/
rt
/
aclocal.m4
diff --git
a/rt/aclocal.m4
b/rt/aclocal.m4
index
67ff30d
..
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],
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=$enableval)
if test "x$LAYOUT" = "x"; then
- LAYOUT="
RT3
"
+ LAYOUT="
relative
"
fi
RT_LAYOUT($srcdir/config.layout, $LAYOUT)
AC_MSG_CHECKING(for chosen layout)
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
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
])
dnl
@@
-76,7
+81,7
@@
AC_DEFUN([RT_LAYOUT],[
s/\s+$/\n/gim;
s/\+$/\/rt3/gim;
# m4 will not let us just use $1, we need @S|@1
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
s/^\s*(.*?)\s*:\s*(.*)$/\(test "x\@S|@@S|@1" = "xNONE" || test "x\@S|@@S|@1" = "x") && @S|@1=@S|@2/gim;
' < $1 > $pldconf
@@
-85,7
+90,7
@@
AC_DEFUN([RT_LAYOUT],[
. $pldconf
changequote({,})
for var in prefix exec_prefix bindir sbindir \
. $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
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(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(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(localstatedir)
RT_SUBST_EXPANDED_ARG(logfiledir)
RT_SUBST_EXPANDED_ARG(masonstatedir)