You are viewing a plain text version of this content. The canonical link for it is here.
Posted to rivet-dev@tcl.apache.org by ka...@apache.org on 2004/12/02 12:02:44 UTC
cvs commit: tcl-rivet/src Makefile.am
karl 2004/12/02 03:02:44
Modified: . ChangeLog README.freebsd configure.ac
src Makefile.am
Log:
Propagate NAMEOFEXECUTABLE into the build via the configure script, etc.
Remove --with-tclsh option. TEA figures it out for us from tclConfig.sh.
Revision Changes Path
1.204 +4 -0 tcl-rivet/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /home/cvs/tcl-rivet/ChangeLog,v
retrieving revision 1.203
retrieving revision 1.204
diff -u -r1.203 -r1.204
--- ChangeLog 2 Dec 2004 09:45:35 -0000 1.203
+++ ChangeLog 2 Dec 2004 11:02:44 -0000 1.204
@@ -1,7 +1,11 @@
2004-12-02 Karl Lehenbauer <ka...@sc.com>
+ * Remove the --with-tclsh option. A path to tclsh is automatically
+ figured out by the TEA 3.1 build stuff -- it looks at tclConfig.sh
* Get automake, aclocal, and autoconf to run without complaint,
generating the configure script, Makefile.in files, etc.
+
+ * Propagate the NAMEOFEXECUTABLE define via the autoconf scripts
2004-12-01 Karl Lehenbauer <ka...@sc.com>
1.3 +3 -2 tcl-rivet/README.freebsd
Index: README.freebsd
===================================================================
RCS file: /home/cvs/tcl-rivet/README.freebsd,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- README.freebsd 2 Dec 2004 09:45:35 -0000 1.2
+++ README.freebsd 2 Dec 2004 11:02:44 -0000 1.3
@@ -24,7 +24,7 @@
Run configure in this directory with the following parameters:
-./configure --with-tcl=/usr/local/lib/tcl8.4 --with-tclinclude=/usr/local/include/tcl8.4 --with-tclsh=/usr/local/bin/tclsh8.4
+./configure --with-tcl=/usr/local/lib/tcl8.4 --with-tclinclude=/usr/local/include/tcl8.4
...or equivalent. Your mileage may vary.
@@ -54,3 +54,4 @@
automake19 --foreign
+aclocal19 -I /usr/local/gnu-autotools/share/aclocal
1.7 +2 -22 tcl-rivet/configure.ac
Index: configure.ac
===================================================================
RCS file: /home/cvs/tcl-rivet/configure.ac,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- configure.ac 2 Dec 2004 10:17:45 -0000 1.6
+++ configure.ac 2 Dec 2004 11:02:44 -0000 1.7
@@ -226,28 +226,8 @@
AC_MSG_ERROR([${with_apxs} is not an executable file])
fi
-AC_ARG_WITH(tclsh, [ --with-tclsh location of the tclsh executable that corresponds to the --with-tcl directory used], with_tclsh=${withval})
+AC_DEFINE_UNQUOTED(NAMEOFEXECUTABLE,"${TCLSH_PROG}")
-if test x"${with_tclsh}" = x ; then
- AC_PATH_PROGS(TCLSH, tclsh)
- if test x"${TCLSH}" = x; then
- AC_MSG_ERROR([Could not find tclsh. tclsh must be in your PATH or you must specify its location using --with-tclsh])
- else
- with_tclsh=${TCLSH}
- fi
-else
- AC_MSG_CHECKING([for tclsh])
- AC_MSG_RESULT([--with-tclsh=${with_tclsh}])
-fi
-
-if test -x "${with_tclsh}" ; then
- NAMEOFEXECUTABLE=-DNAMEOFEXECUTABLE=\\\"${with_tclsh}\\\"
- AC_SUBST(NAMEOFEXECUTABLE)
-else
- AC_MSG_ERROR([${with_tclsh} is not an executable file])
-fi
-
-#--------------------------------------------------------------------
# Finally, substitute all of the various values into the Makefile.
# You may alternatively have a special pkgIndex.tcl.in or other files
# which require substituting th AC variables in. Include these here.
1.4 +1 -1 tcl-rivet/src/Makefile.am
Index: Makefile.am
===================================================================
RCS file: /home/cvs/tcl-rivet/src/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Makefile.am 2 Dec 2004 09:45:36 -0000 1.3
+++ Makefile.am 2 Dec 2004 11:02:44 -0000 1.4
@@ -10,5 +10,5 @@
mod_rivet_la_LDFLAGS = @TCL_LIB_SPEC@ @APXS_LDFLAGS@ -no-undefined -module -avoid-version
mod_rivet_la_LIBADD = @TCL_LIBS@ @APXS_LIBS@
-mod_rivet_la_CPPFLAGS = @TCL_INCLUDES@ @APXS_CPPFLAGS@ @APXS_INCLUDES@ -DSTART_TAG='"<?"' -DEND_TAG='"?>"' @NAMEOFEXECUTABLE@
+mod_rivet_la_CPPFLAGS = @TCL_INCLUDES@ @APXS_CPPFLAGS@ @APXS_INCLUDES@ -DSTART_TAG='"<?"' -DEND_TAG='"?>"'
---------------------------------------------------------------------
To unsubscribe, e-mail: rivet-cvs-unsubscribe@tcl.apache.org
For additional commands, e-mail: rivet-cvs-help@tcl.apache.org
Re: cvs commit: tcl-rivet/src Makefile.am
Posted by Karl Lehenbauer <ka...@sc.com>.
I'm putting it back.
On Dec 2, 2004, at 5:08 AM, David N. Welton wrote:
> karl@apache.org writes:
>
>> 2004-12-02 Karl Lehenbauer <ka...@sc.com>
>> + * Remove the --with-tclsh option. A path to tclsh is
>> automatically
>> + figured out by the TEA 3.1 build stuff -- it looks at
>> tclConfig.sh
>
> Yeah? Even if it's in a weird place?
>
> --
> David N. Welton
> Personal: http://www.dedasys.com/davidw/
> Apache Tcl: http://tcl.apache.org/
> Free Software: http://www.dedasys.com/freesoftware/
> Linux Incompatibility List: http://www.leenooks.com/
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: rivet-dev-unsubscribe@tcl.apache.org
> For additional commands, e-mail: rivet-dev-help@tcl.apache.org
>
Re: cvs commit: tcl-rivet/src Makefile.am
Posted by "David N. Welton" <da...@dedasys.com>.
karl@apache.org writes:
> 2004-12-02 Karl Lehenbauer <ka...@sc.com>
> + * Remove the --with-tclsh option. A path to tclsh is automatically
> + figured out by the TEA 3.1 build stuff -- it looks at tclConfig.sh
Yeah? Even if it's in a weird place?
--
David N. Welton
Personal: http://www.dedasys.com/davidw/
Apache Tcl: http://tcl.apache.org/
Free Software: http://www.dedasys.com/freesoftware/
Linux Incompatibility List: http://www.leenooks.com/
---------------------------------------------------------------------
To unsubscribe, e-mail: rivet-dev-unsubscribe@tcl.apache.org
For additional commands, e-mail: rivet-dev-help@tcl.apache.org