[Rt-commit] rt branch, 4.0/remove-old-aclocal-files, created. rt-4.0.4-203-g0a8a01d
Kevin Falcone
falcone at bestpractical.com
Tue Jan 17 12:11:54 EST 2012
The branch, 4.0/remove-old-aclocal-files has been created
at 0a8a01d2ea7a0026fa4d4d04d220084a9595d4ab (commit)
- Log -----------------------------------------------------------------
commit 0a8a01d2ea7a0026fa4d4d04d220084a9595d4ab
Author: Kevin Falcone <falcone at bestpractical.com>
Date: Tue Jan 17 11:00:15 2012 -0500
This dir is normally used by aclocal to generate aclocal.m4
We've never been good about updating m4/* and then running
aclocal -I m4. We tend to edit both sets of files independently, in two
different commits. Sometimes we change aclocal.m4 and never get around
to updating m4/. Rather than adding a new step to the releng process,
it seems safer to just remove cruft.
There was a make reconfigure line that would do this, but I'm not aware
of it ever being recommended or documented anywhere.
diff --git a/Makefile.in b/Makefile.in
index ba8187b..2873022 100755
--- a/Makefile.in
+++ b/Makefile.in
@@ -471,12 +471,6 @@ license-tag:
factory: initialize-database
cd lib; $(PERL) ../devel/tools/factory $(DB_DATABASE) RT
-reconfigure:
- aclocal -I m4
- autoconf
- chmod 755 ./configure
- ./configure
-
start-httpd:
$(PERL) sbin/standalone_httpd &
diff --git a/m4/rt_enable_layout.m4 b/m4/rt_enable_layout.m4
deleted file mode 100755
index cadec1c..0000000
--- a/m4/rt_enable_layout.m4
+++ /dev/null
@@ -1,36 +0,0 @@
-dnl
-dnl @synopsis RT_ENABLE_LAYOUT()
-dnl
-dnl Enable a specific directory layout for the installation to use.
-dnl This configures a command-line parameter that can be specified
-dnl at ./configure invocation.
-dnl
-dnl The use of this feature in this way is a little hackish, but
-dnl better than a heap of options for every directory.
-dnl
-dnl This code is heavily borrowed *cough* from the Apache 2 code.
-dnl
-
-AC_DEFUN([RT_ENABLE_LAYOUT],[
-AC_ARG_ENABLE(layout,
- AC_HELP_STRING([--enable-layout=LAYOUT],
- [Use a specific directory layout (Default: RT3)]),
- LAYOUT=$enableval)
-
-if test "x$LAYOUT" = "x"; then
- LAYOUT="RT3"
-fi
-RT_LAYOUT($srcdir/config.layout, $LAYOUT)
-AC_MSG_CHECKING(for chosen layout)
-if test "x$rt_layout_name" = "xno"; then
- if test "x$LAYOUT" = "xno"; then
- AC_MSG_RESULT(none)
- else
- AC_MSG_RESULT($LAYOUT)
- fi
- AC_MSG_ERROR([a valid layout must be specified (or the default used)])
-else
- AC_SUBST(rt_layout_name)
- AC_MSG_RESULT($rt_layout_name)
-fi
-])
diff --git a/m4/rt_expand_var.m4 b/m4/rt_expand_var.m4
deleted file mode 100755
index cec884a..0000000
--- a/m4/rt_expand_var.m4
+++ /dev/null
@@ -1,18 +0,0 @@
-dnl
-dnl @synopsis RT_EXPAND_VAR(baz, $fraz)
-dnl
-dnl Iteratively expands the second parameter, until successive iterations
-dnl yield no change. The result is then assigned to the first parameter.
-dnl
-dnl This code is heavily borrowed from the Apache 2 codebase.
-dnl
-
-AC_DEFUN([RT_EXPAND_VAR],[
- ap_last=''
- ap_cur='$2'
- while test "x${ap_cur}" != "x${ap_last}"; do
- ap_last="${ap_cur}"
- ap_cur=`eval "echo ${ap_cur}"`
- done
- $1="${ap_cur}"
-])
diff --git a/m4/rt_layout.m4 b/m4/rt_layout.m4
deleted file mode 100755
index e7535f9..0000000
--- a/m4/rt_layout.m4
+++ /dev/null
@@ -1,78 +0,0 @@
-dnl
-dnl @synopsis RT_LAYOUT(configlayout, layoutname)
-dnl
-dnl This macro reads an Apache-style layout file (specified as the
-dnl configlayout parameter), and searches for a specific layout
-dnl (named using the layoutname parameter).
-dnl
-dnl The entries for a given layout are then inserted into the
-dnl environment such that they become available as substitution
-dnl variables. In addition, the rt_layout_name variable is set
-dnl (but not exported) if the layout is valid.
-dnl
-dnl This code is heavily borrowed *cough* from the Apache 2 codebase.
-dnl
-
-AC_DEFUN([RT_LAYOUT],[
- if test ! -f $srcdir/config.layout; then
- AC_MSG_WARN([Layout file $srcdir/config.layout not found])
- rt_layout_name=no
- else
- pldconf=./config.pld
- $PERL -0777 -p -e "\$layout = '$2';" -e '
- s/.*<Layout\s+$layout>//gims;
- s/<\/Layout>.*//s;
- s/^#.*$//gm;
- s/^\s+//gim;
- s/\s+$/\n/gim;
- s/\+$/\/rt3/gim;
- # m4 will not let us just use $1, we need @S|@1
-# s/^((?:bin|sbin|libexec|data|sysconf|sharedstate|localstate|lib|include|oldinclude|plugin|info|man)dir)\s*:\s*(.*)$/@S|@1=@S|@2/gim;
- # uh, should be [:=], but m4 apparently substitutes something...
- s/^(.*?)\s*(?::|=)\s*(.*)$/\(test "x\@S|@@S|@1" = "xNONE" || test "x\@S|@@S|@1" = "x") && @S|@1=@S|@2/gim;
- ' < $1 > $pldconf
-
- if test -s $pldconf; then
- rt_layout_name=$2
- . $pldconf
- changequote({,})
- for var in prefix exec_prefix bindir sbindir \
- sysconfdir mandir libdir datadir htmldir fontdir \
- localstatedir logfiledir masonstatedir plugindir \
- sessionstatedir customdir custometcdir customhtmldir \
- customplugindir customlexdir customlibdir manualdir; do
- eval "val=\"\$$var\""
- val=`echo $val | sed -e 's:\(.\)/*$:\1:'`
- val=`echo $val |
- sed -e 's:[\$]\([a-z_]*\):${\1}:g'`
- eval "$var='$val'"
- done
- changequote([,])
- else
- rt_layout_name=no
- fi
- #rm $pldconf
- fi
- RT_SUBST_EXPANDED_ARG(prefix)
- RT_SUBST_EXPANDED_ARG(exec_prefix)
- RT_SUBST_EXPANDED_ARG(bindir)
- RT_SUBST_EXPANDED_ARG(sbindir)
- RT_SUBST_EXPANDED_ARG(sysconfdir)
- RT_SUBST_EXPANDED_ARG(mandir)
- 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)
- RT_SUBST_EXPANDED_ARG(sessionstatedir)
- RT_SUBST_EXPANDED_ARG(customdir)
- RT_SUBST_EXPANDED_ARG(custometcdir)
- RT_SUBST_EXPANDED_ARG(customhtmldir)
- RT_SUBST_EXPANDED_ARG(customlexdir)
- RT_SUBST_EXPANDED_ARG(customlibdir)
- RT_SUBST_EXPANDED_ARG(customplugindir)
-])dnl
diff --git a/m4/rt_subst_expanded_arg.m4 b/m4/rt_subst_expanded_arg.m4
deleted file mode 100755
index 02002b0..0000000
--- a/m4/rt_subst_expanded_arg.m4
+++ /dev/null
@@ -1,14 +0,0 @@
-dnl
-dnl @synopsis RT_SUBST_EXPANDED_ARG(var)
-dnl
-dnl Export (via AC_SUBST) a given variable, along with an expanded
-dnl version of the variable (same name, but with exp_ prefix).
-dnl
-dnl This code is heavily borrowed *cough* from the Apache 2 source.
-dnl
-
-AC_DEFUN([RT_SUBST_EXPANDED_ARG],[
- RT_EXPAND_VAR(exp_$1, [$]$1)
- AC_SUBST($1)
- AC_SUBST(exp_$1)
-])
-----------------------------------------------------------------------
More information about the Rt-commit
mailing list