[Synopsis-cvs] Synopsis/Synopsis README,1.14,1.15 configure.in,1.15,1.16

[Stephen Davies]

Update of /cvsroot/synopsis/Synopsis
In directory sc8-pr-cvs1:/tmp/cvs-serv29007

Modified Files:
	README configure.in 
Log Message:
Fixed --disable-gc to work, and run configure in GC directory only if not
disabled.


Index: README
===================================================================
RCS file: /cvsroot/synopsis/Synopsis/README,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -d -r1.14 -r1.15
--- README	13 Mar 2003 08:05:15 -0000	1.14
+++ README	24 Mar 2003 09:05:38 -0000	1.15
@@ -40,6 +40,11 @@ probably need to specify --disable-gc to
 * run ./configure (with parameters, if appropriate)
 * run make
 
+Note that ./configure will also run configure in Synopsis/Parser/C++/gc,
+unless you specify the --disable-gc option. Configure is run with default
+options - to change these please manually run ./configure from that directory
+also.
+
 ** Installing
 
 Ensure you have write permissions to the install prefix directories (eg: log

Index: configure.in
===================================================================
RCS file: /cvsroot/synopsis/Synopsis/configure.in,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -d -r1.15 -r1.16
--- configure.in	24 Mar 2003 08:31:38 -0000	1.15
+++ configure.in	24 Mar 2003 09:05:38 -0000	1.16
@@ -33,7 +33,7 @@ AC_PROG_CPP
 AC_PROG_CXX
 AC_PROG_INSTALL
 
-AC_ARG_WITH(python-prefix, [  --with-python-prefix  Prefix for python],[python_prefix="$withval"])
+AC_ARG_WITH(python-prefix, [  --with-python-prefix    Prefix for python],[python_prefix="$withval"])
 if test ".$python_prefix" != . ; then
 	python_cppflags=-I$python_prefix/include
 else
@@ -41,7 +41,7 @@ else
 fi
 
 python_version=
-AC_ARG_WITH(python-version, [  --with-python-version  Python version to use],[python_version="$withval"])
+AC_ARG_WITH(python-version, [  --with-python-version   Python version to use],[python_version="$withval"])
 
 dnl
 dnl check for python's C API
@@ -75,7 +75,9 @@ python_include="<python${python_version}
 python_lib="-L${python_prefix}/lib/python${python_version}/config -lpython${python_version}"
 
 AC_CHECK_FUNCS(openpty,, AC_CHECK_LIB(util,openpty, [AC_DEFINE(HAVE_OPENPTY)] [LIBS="$LIBS -lutil"]))
-AC_ARG_ENABLE(GC, [use garbage collector in C++ parser],[use_gc="$enableval"],[use_gc=yes])
+AC_ARG_ENABLE([gc], 
+    [  --disable-gc            don't use garbage collector in C++ parser (default is enabled)],
+    [use_gc=no],[use_gc=yes])
 
 AC_SUBST(use_gc)
 AC_SUBST(python_version)
@@ -105,7 +107,16 @@ AC_SUBST(library_ext)
 AC_SUBST(cpp_profile)
 
 if test "$use_gc" = yes; then
-    AC_CONFIG_SUBDIRS(Synopsis/Parser/C++/gc)
+    dnl AC_CONFIG_SUBDIRS always runs configure... :(
+    echo "Running configure in Synopsis/Parser/C++/gc ..."
+    echo "-----------------------------------------------"
+    popdir=`pwd`
+    cd Synopsis/Parser/C++/gc
+    ./configure
+    cd $popdir
+    echo "-----------------------------------------------"
+    echo "- Configure for Garbage Collector was run with default options."
+    echo "- Please rerun manually if required."
 fi
 
 AC_OUTPUT([