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:40:43 UTC
cvs commit: tcl-rivet ChangeLog configure configure.ac
karl 2004/12/02 03:40:43
Modified: . ChangeLog configure configure.ac
Log:
Put the --with-tclsh option back in.
Revision Changes Path
1.206 +10 -3 tcl-rivet/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /home/cvs/tcl-rivet/ChangeLog,v
retrieving revision 1.205
retrieving revision 1.206
diff -u -r1.205 -r1.206
--- ChangeLog 2 Dec 2004 11:10:59 -0000 1.205
+++ ChangeLog 2 Dec 2004 11:40:42 -0000 1.206
@@ -1,12 +1,19 @@
2004-12-02 Karl Lehenbauer <ka...@sc.com>
+ * The configure scirpt is building the .so files properly, it
+ appears. However the install isn't quite right yet. For
+ example, the mod_rivet.so file needs to go into APXS_LIBEXECDIR,
+ and the other .so files need to go where mod_*.so is currently
+ going.
+
* Move aclocal.m4 to acinclude.m4 -- we need the aclocal command
to generate acinclude.m4 based on aclocal.m4 and stuff it gleans
from the configure.ac script, etc.
- * configure.ac: 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
+ * configure.ac: A path to tclsh is automatically figured out by the
+ TEA 3.1 build stuff. However it is also possible to override
+ with --with-tclsh, and the configure script also makes sure
+ there at least is a file there as well.
* src/configure.ac et al: Get automake, aclocal, and autoconf to run
without complaint, generating the configure script, Makefile.in
1.2 +19 -0 tcl-rivet/configure
Index: configure
===================================================================
RCS file: /home/cvs/tcl-rivet/configure,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- configure 2 Dec 2004 11:11:00 -0000 1.1
+++ configure 2 Dec 2004 11:40:42 -0000 1.2
@@ -26219,6 +26219,23 @@
# Add WISH as well if this is a Tk extension.
#--------------------------------------------------------------------
+#
+# allow them to override the tclsh we think we found
+#
+if test x"${with_tclsh}" != x ; then
+ echo "$as_me:$LINENO: checking for tclsh" >&5
+echo $ECHO_N "checking for tclsh... $ECHO_C" >&6
+ if test -f "${with_tclsh}" ; then
+ TCLSH_PROG=${with_tclsh}
+ echo "$as_me:$LINENO: result: manually set by --with-tclsh=$TCLSH_PROG" >&5
+echo "${ECHO_T}manually set by --with-tclsh=$TCLSH_PROG" >&6
+ else
+ { { echo "$as_me:$LINENO: error: No tclsh at place specified by --with-tclsh (${with_tclsh})" >&5
+echo "$as_me: error: No tclsh at place specified by --with-tclsh (${with_tclsh})" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+
+else
echo "$as_me:$LINENO: checking for tclsh" >&5
echo $ECHO_N "checking for tclsh... $ECHO_C" >&6
@@ -26259,6 +26276,8 @@
{ (exit 1); exit 1; }; }
fi
+
+fi
#TEA_PROG_WISH
1.8 +16 -1 tcl-rivet/configure.ac
Index: configure.ac
===================================================================
RCS file: /home/cvs/tcl-rivet/configure.ac,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- configure.ac 2 Dec 2004 11:02:44 -0000 1.7
+++ configure.ac 2 Dec 2004 11:40:42 -0000 1.8
@@ -182,7 +182,22 @@
# Add WISH as well if this is a Tk extension.
#--------------------------------------------------------------------
+#
+# allow them to override the tclsh we think we found
+#
+if test x"${with_tclsh}" != x ; then
+ AC_MSG_CHECKING([for tclsh])
+ if test -f "${with_tclsh}" ; then
+ TCLSH_PROG=${with_tclsh}
+ AC_MSG_RESULT([manually set by --with-tclsh=$TCLSH_PROG])
+ else
+ AC_MSG_ERROR([No tclsh at place specified by --with-tclsh (${with_tclsh})])
+ fi
+ AC_SUBST(TCLSH_PROG)
+else
TEA_PROG_TCLSH
+fi
+
#TEA_PROG_WISH
# We have to either find apxs or be told where it is using --with-apxs
---------------------------------------------------------------------
To unsubscribe, e-mail: rivet-cvs-unsubscribe@tcl.apache.org
For additional commands, e-mail: rivet-cvs-help@tcl.apache.org