aboutsummaryrefslogtreecommitdiff
path: root/aclocal.m4
diff options
context:
space:
mode:
authorRob Savoye <rob@welcomehome.org>2001-02-18 05:12:06 +0000
committerRob Savoye <rob@welcomehome.org>2001-02-18 05:12:06 +0000
commitd1796b46df0f70ddb14b62013d88d2292995c7f1 (patch)
tree0db1f064cd71218d42418c64f411bab128ac0d06 /aclocal.m4
parent229fa96029bd352626b934a724c88eba6a1350f7 (diff)
downloaddejagnu-d1796b46df0f70ddb14b62013d88d2292995c7f1.zip
dejagnu-d1796b46df0f70ddb14b62013d88d2292995c7f1.tar.gz
dejagnu-d1796b46df0f70ddb14b62013d88d2292995c7f1.tar.bz2
* Most all files: Update copyright notices.
* Makefile.am: Add support for making RPMs. Force different values for RUNTEST and RUNTESTFLAGS, so we can test ourselves. * testsuite/Makefile.am: Force a different value for RUNTESTFLAGS. * acinclude.m4, configure.in: Find Tclsh, and Docbook. * configure: Regenerated. * doc/Makefile.am: Use $DOCBOOK to find the filters. * doc/overview: Add the html version of the doc so one doesn't need docbook to read the manual. * example/calc/Makefile.am: New automake support. * example/calc/Makefile.in: Generated. * example/Makefile.am: Recursion support for make. * example/calc/Makefile.in: Generated by automake. * example/calc/calc.h.in: Move constants to calc.c, so we can use autoheader. * example/calc/calc.c: Add constants from calc.h.in. * redhat/dejagnu.spec: New RPM packaging file. * debian/{changelog,conffiles,control,copyright,postinst,preinst, rules,site.exp}: New Debian packaging support.
Diffstat (limited to 'aclocal.m4')
-rw-r--r--aclocal.m488
1 files changed, 88 insertions, 0 deletions
diff --git a/aclocal.m4 b/aclocal.m4
index f5379a5..4884dc2 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -10,6 +10,94 @@ dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
dnl PARTICULAR PURPOSE.
+AC_DEFUN(DJ_AC_PATH_TCLSH, [
+dirlist=".. ../../ ../../../ ../../../../ ../../../../../ ../../../../../../ ../
+../../../../../.. ../../../../../../../.. ../../../../../../../../.. ../../../..
+/../../../../../.."
+no_itcl=true
+AC_MSG_CHECKING(for the tclsh program)
+AC_ARG_WITH(tclinclude, [ --with-tclinclude directory where tcl header
+s are], with_tclinclude=${withval})
+AC_CACHE_VAL(ac_cv_path_tclsh,[
+dnl first check to see if --with-itclinclude was specified
+if test x"${with_tclinclude}" != x ; then
+ if test -f ${with_tclinclude}/tclsh ; then
+ ac_cv_path_tclsh=`(cd ${with_tclinclude}; pwd)`
+ elif test -f ${with_tclinclude}/src/tclsh ; then
+ ac_cv_path_tclsh=`(cd ${with_tclinclude}/src; pwd)`
+ else
+ AC_MSG_ERROR([${with_tclinclude} directory doesn't contain tclsh])
+ fi
+fi
+])
+
+dnl next check in private source directory
+dnl since ls returns lowest version numbers first, reverse its output
+if test x"${ac_cv_path_tclsh}" = x ; then
+ dnl find the top level Itcl source directory
+ for i in $dirlist; do
+ if test -n "`ls -dr $srcdir/$i/tcl* 2>/dev/null`" ; then
+ tclpath=$srcdir/$i
+ break
+ fi
+ done
+
+ dnl find the exact Itcl source dir. We do it this way, cause there
+ dnl might be multiple version of Itcl, and we want the most recent one.
+ for i in `ls -dr $tclpath/tcl* 2>/dev/null ` ; do
+ if test -f $i/src/tclsh ; then
+ ac_cv_path_tclsh=`(cd $i/src; pwd)`/tclsh
+ break
+ fi
+ done
+fi
+
+dnl see if one is installed
+if test x"${ac_cv_path_tclsh}" = x ; then
+ AC_MSG_RESULT(none)
+ AC_PATH_PROG(tclsh, tclsh)
+else
+ AC_MSG_RESULT(${ac_cv_path_tclsh})
+fi
+TCLSH="${ac_cv_path_tclsh}"
+AC_SUBST(TCLSH)
+])
+
+
+AC_DEFUN(DJ_AC_PATH_DOCBOOK, [
+dirlist=".. ../../ ../../.. ../../../.. ../../../../.. ../../../../../.. ../../../../../../.. ../../../../../../../.. ../../../../../../../../.. ../../../../../../../../../.."
+AC_MSG_CHECKING(for docbook tools)
+AC_ARG_WITH(oskith, [ --with-docbook directory where the db2 sgml tools are], with_docbook=${withval})
+AC_CACHE_VAL(ac_cv_c_docbook,[
+dnl first check to see if --with-docbook was specified
+if test x"${with_docbook}" != x ; then
+ if test -f ${with_docbook}/db2html ; then
+ ac_cv_c_docbook=`(cd ${with_docbook}; pwd)`
+ else
+ AC_MSG_ERROR([${with_docbook} directory doesn't contain SGML tools])
+ fi
+fi
+])
+if test x"${ac_cv_c_docbook}" = x ; then
+ for i in $ac_default_prefix/bin /usr/local/bin $OSKITHDIR/../bin /usr/bin /bin /opt /home; do
+ dnl See is we have an SGML tool in that directory.
+ if test -f $i/db2html ; then
+ ac_cv_c_docbook=$i
+ break
+ fi
+ done
+fi
+
+if test x"${ac_cv_c_docbook}" = x ; then
+ AC_MSG_RESULT(none)
+else
+ DOCBOOK="${ac_cv_c_docbook}"
+ AC_MSG_RESULT(${ac_cv_c_docbook})
+fi
+
+AC_SUBST(DOCBOOK)
+])
+
# Do all the work for Automake. This macro actually does too much --
# some checks are only needed if your package does certain things.
# But this isn't really a big deal.