Fresco Makefile.in,1.42,1.43 configure.ac,1.25,1.26

Update of /cvs/fresco/Fresco
In directory purcel:/tmp/cvs-serv20833

Modified Files:
	Makefile.in configure.ac 
Log Message:
A couple of buildsystem fixes:
 * Reactivated some old code from Havard: --enable-optimization and
     --enable-debugging should work again (closes bug45)
 * --enable-c++-demos renamed to --enable-cxx-demos: Looks like
      autoconf does not like + in options (closes bug173)
 * Toplevel Makefile should check for "Makefile" in the subproject's dirs:
      --disable-sdl should now work, even if builddir == srcdir       
      (closes bug209)
 * Remove -rdynamic flag: We need gcc > 3.0 now and I can't find any 
      documentation on this flag anymore (closes bug79)
 * Various small cleanups like replacing macros that are getting obsolete)


Index: Makefile.in
===================================================================
RCS file: /cvs/fresco/Fresco/Makefile.in,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- Makefile.in	6 Apr 2003 20:30:03 -0000	1.42
+++ Makefile.in	14 May 2003 22:42:09 -0000	1.43
@@ -34,9 +34,10 @@
                    contrib/daVinci
 
 testbase_dir	:= $(shell test -d Fresco-Test && echo 'Fresco-Test')
-mandatory_dirs	:= $(foreach package, $(mandatory), $(shell test -d $(package) && echo '$(package)'))
-optional_dirs	:= $(foreach package, $(optional), $(shell test -d $(package) && echo '$(package)'))
-subdirs		:= $(testbase_dir) $(mandatory_dirs) $(optional_dirs)
+mandatory_dirs  := $(foreach package, $(mandatory), $(shell if test -d $(package) -a -f $(package)/Makefile ; then echo '$(package)'; fi ))
+missing_mandatory_dirs := $(foreach package, $(mandatory), $(shell if test ! -d $(package) -o ! -f $(package)/Makefile ; then echo '$(package)'; fi ))
+optional_dirs	:= $(foreach package, $(optional), $(shell test -d $(package) && test -f $(package)/Makefile && echo '$(package)'))
+subdirs		:= $(missing_mandatory_dirs) $(testbase_dir) $(mandatory_dirs) $(optional_dirs)
 sxrdirs		:= Prague Babylon Berlin
 
 # Overridden by the clean-targets, allowing the same subdirs-rule to be used
@@ -48,6 +49,10 @@
         clean distclean maintainer-clean
 
 all:	$(subdirs)
+
+$(missing_mandatory_dirs):
+	@echo "The mandatory package \"$@\" not properly configured!"
+	@exit 1
 
 $(mandatory_dirs): %: %/Makefile
 	@echo "making $(action) in $@"

Index: configure.ac
===================================================================
RCS file: /cvs/fresco/Fresco/configure.ac,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- configure.ac	4 Mar 2003 05:44:50 -0000	1.25
+++ configure.ac	14 May 2003 22:42:09 -0000	1.26
@@ -41,8 +41,8 @@
 AC_ARG_ENABLE(sdl,
               AC_HELP_STRING([--enable-sdl],[Configure with sdl support]),
               [config_sdl="$enableval"],[config_sdl="yes"])
-AC_ARG_ENABLE(c++-demos,
-              AC_HELP_STRING([--enable-c++-demos],[Configure c++ demos support]),
+AC_ARG_ENABLE(cxx-demos,
+              AC_HELP_STRING([--enable-cxx-demos],[Configure c++ demos support]),
               [config_cxx_demos="$enableval"],[config_cxx_demos="yes"])
 AC_ARG_ENABLE(python-runtime,
               AC_HELP_STRING([--enable-python-runtime],[Configure python runtime support]),