X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=rt%2Faclocal.m4;h=793644f1256703465b754155ee3d867534c62d0a;hp=475b3890dc0964787e6385b8a3bb08216be7fd0e;hb=681a340f6be4184b1472a8e1fa9cd5d074f6f325;hpb=2041a9143fac20b79ead4a1ae01224dedf5b27c2

diff --git a/rt/aclocal.m4 b/rt/aclocal.m4
index 475b3890d..793644f12 100644
--- a/rt/aclocal.m4
+++ b/rt/aclocal.m4
@@ -1,6 +1,6 @@
-dnl aclocal.m4 generated automatically by aclocal 1.4-p4
+dnl aclocal.m4 generated automatically by aclocal 1.4-p6
 
-dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -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
@@ -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*((?: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
 
@@ -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 staticdir localstatedir logfiledir masonstatedir \
 				 sessionstatedir customdir custometcdir customhtmldir \
-				 customlexdir customlibdir manualdir; do
+				 customlexdir customstaticdir customplugindir customlibdir manualdir; do
 				eval "val=\"\$$var\""
 				val=`echo $val | sed -e 's:\(.\)/*$:\1:'`
 				val=`echo $val | 
@@ -108,17 +113,23 @@ 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(staticdir)
 	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(customstaticdir)
 	RT_SUBST_EXPANDED_ARG(customlibdir)
 ])dnl