[simspark-cvs] simspark/spark configure.ac,1.4,1.5

[Oliver O. <fr...@us...>]

Update of /cvsroot/simspark/simspark/spark
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5914

Modified Files:
	configure.ac 
Log Message:
- cleaned up the old Spades check and installed the new macro.
  SPARK is now configured to (not) use SPADES by using the --enable-spades
  (--disable-spades) option instead of the --with-spades option.
  --enable/--disable should be used for controlling optional features.


Index: configure.ac
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/configure.ac,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** configure.ac	8 Mar 2006 09:30:37 -0000	1.4
--- configure.ac	8 Mar 2006 17:13:42 -0000	1.5
***************
*** 118,166 ****
  RCSS_CHECK_RUBY_VERSION(1,8,0)
  RCSS_CHECK_ODE
  
  WX_CPPFLAGS="`wx-config --cppflags`"
  WX_LDFLAGS="`wx-config --libs` `wx-config --gl-libs`"
- 
  AC_SUBST(WX_CPPFLAGS)
  AC_SUBST(WX_LDFLAGS)
  
- AC_ARG_VAR(SPADES, [prefix of SPADES installation])
- AC_ARG_WITH([spades],
- 	    [AC_HELP_STRING([--with-spades],
- 	 	 	    [whether to support SPADES-SIM (default is yes)])],
- 	    [rcss_with_spades=$withval],
- 	    [rcss_with_spades=yes])
- 
- if test "$rcss_with_spades" = yes; then
- 	if test "$SPADES"; then
- 	  if test -z "$PATH"; then
- 	    PATH="$SPADES/bin"
- 	  else
- 	    PATH="$PATH:$SPADES/bin"
- 	  fi
- 	  if test -z "$LDFLAGS"; then
- 	    LDFLAGS="-L$SPADES/lib"
- 	  else
- 	    LDFLAGS="$LDFLAGS -L$SPADES/lib"
- 	  fi
- 	  if test -z "$CPPFLAGS"; then
- 	    CPPFLAGS="-I$SPADES/include"
- 	  else
- 	    CPPFLAGS="$CPPFLAGS -I$SPADES/include"
- 	  fi
- 	fi
- 	RCSS_LIB_SPADES([rcss_build_spades=yes
- 	 	         AC_DEFINE([HAVE_SPADES_HEADERS], 1, 
- 			           [Define to 1 if you have the SPADES header files])],
-                         [AC_MSG_ERROR([the SPADES library (http://spades-sim.sourceforge.net) cannot be found. Please specify the prefix used when installing SPADES with the SPADES enviroment variable.])])
- else
- 	rcss_build_spades=no
- 	AC_MSG_NOTICE([SpadesServer will not be build])
- fi
- AM_CONDITIONAL(BUILD_SPADES_MODULES, test $rcss_build_spades = yes)
- 
- 
- 
- 
  # create Makefiles and other configuration files
  AC_CONFIG_FILES([Makefile \
--- 118,128 ----
  RCSS_CHECK_RUBY_VERSION(1,8,0)
  RCSS_CHECK_ODE
+ RCSS_BUILD_SPADES_SERVER
  
  WX_CPPFLAGS="`wx-config --cppflags`"
  WX_LDFLAGS="`wx-config --libs` `wx-config --gl-libs`"
  AC_SUBST(WX_CPPFLAGS)
  AC_SUBST(WX_LDFLAGS)
  
  # create Makefiles and other configuration files
  AC_CONFIG_FILES([Makefile \