[Vm-dev] [commit][2816] Fix snafu in changing unix configure script to allow specifying of different

[commits at squeakvm.org]

Revision: 2816
Author:   eliot
Date:     2013-11-19 15:53:24 -0800 (Tue, 19 Nov 2013)
Log Message:
-----------
Fix snafu in changing unix configure script to allow specifying of different
plugins dir.  Judiciously apply some svn:ignore properties.

Modified Paths:
--------------
    branches/Cog/platforms/unix/config/configure
    branches/Cog/platforms/unix/config/configure.ac

Property Changed:
----------------
    branches/Cog/platforms/Cross/vm/sqSCCSVersion.h
    branches/Cog/spurcogbuild/macbuild/
    branches/Cog/spurstackbuild/cygwinbuild/


Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h
___________________________________________________________________
Modified: checkindate
   - Tue Nov 19 14:22:25 PST 2013
   + Tue Nov 19 15:52:36 PST 2013

Modified: branches/Cog/platforms/unix/config/configure
===================================================================
--- branches/Cog/platforms/unix/config/configure	2013-11-19 22:23:16 UTC (rev 2815)
+++ branches/Cog/platforms/unix/config/configure	2013-11-19 23:53:24 UTC (rev 2816)
@@ -1038,7 +1038,7 @@
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
   --with-src=dir          generated src directory default=src
-  --with-plugins=dir          generated plugins directory default=src/plugins
+  --with-plugins=dir          generated plugins directory default=${vmmdir}/plugins
   --with-vmmcfg=dir        vm configuration directory containing plugins.int and plugins.ext default=.
   --with-gnu-awk          assume that awk is GNU gawk default=no
   --with-gnu-as           assume that as is the GNU assembler default=no
@@ -1540,12 +1540,12 @@
 # Check whether --with-plugins or --without-plugins was given.
 if test "${with_plugins+set}" = set; then
   withval="$with_plugins"
-   vmpsrc="${with_plugins}"
+   vmpsrc="${topdir}/${with_plugins}"
 else
-   vmpsrc="src/plugins"
+   vmpsrc="${vmmdir}/plugins"
 fi;
 
-vmpdir="${topdir}/${vmpsrc}"
+vmpdir="${vmpsrc}"
 
 if test ! -d "${topdir}/${vmmsrc}"; then
   if test -d "${topdir}/platforms/unix/${vmmsrc}/vm"; then

Modified: branches/Cog/platforms/unix/config/configure.ac
===================================================================
--- branches/Cog/platforms/unix/config/configure.ac	2013-11-19 22:23:16 UTC (rev 2815)
+++ branches/Cog/platforms/unix/config/configure.ac	2013-11-19 23:53:24 UTC (rev 2816)
@@ -47,11 +47,11 @@
 vmmdir="${topdir}/${vmmsrc}"
 
 AC_ARG_WITH(plugins,
-[  --with-plugins=dir          generated plugins directory [default=src/plugins]],
-[ vmpsrc="${with_plugins}"],
-[ vmpsrc="src/plugins"])
+[  --with-plugins=dir          generated plugins directory [default=${vmmdir}/plugins]],
+[ vmpsrc="${topdir}/${with_plugins}"],
+[ vmpsrc="${vmmdir}/plugins"])
 
-vmpdir="${topdir}/${vmpsrc}"
+vmpdir="${vmpsrc}"
 
 if test ! -d "${topdir}/${vmmsrc}"; then
   if test -d "${topdir}/platforms/unix/${vmmsrc}/vm"; then


Property changes on: branches/Cog/spurcogbuild/macbuild
___________________________________________________________________
Added: svn:ignore
   + build
*.app
*.bundle
LOG*
*.sources
sqNamedPrims.h



Property changes on: branches/Cog/spurstackbuild/cygwinbuild
___________________________________________________________________
Added: svn:ignore
   + build
buildast
builddbg
eitheror.exe
mkNamedPrims.exe
sqNamedPrims.h