[simspark-cvs] simspark/spark acinclude.m4,1.2,1.3

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

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

Modified Files:
	acinclude.m4 
Log Message:
- changed DevIL check to define preprocessor symbols
- removed rcssbase check (not needed)
- renamed AC_SPADES... macro to RCSS_BUILD_SPADES_SERVER (the AC prefix means 
  that the macro was provided by autoconf, mere mortal users like us are
  encouraged to use a different prefix for our macros)


Index: acinclude.m4
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/acinclude.m4,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** acinclude.m4	19 Feb 2006 12:56:07 -0000	1.2
--- acinclude.m4	8 Mar 2006 09:22:42 -0000	1.3
***************
*** 86,111 ****
  ]) # RCSS_CHECK_RUBY_VERSION
  
- # RCSS_CHECK_RCSSBASE
- #-----------------------------------------------------------------------------
- AC_DEFUN([RCSS_CHECK_RCSSBASE], [
- 	AC_ARG_VAR(RCSSBASE, [location of rcssbase installation])
- 	if test $RCSSBASE; then
- 	   CPPFLAGS="$CPPFLAGS -I$RCSSBASE/include"
- 	   LDFLAGS="$LDFLAGS -L$RCSSBASE/lib"
- 	fi
- 
- 	AC_CHECK_HEADERS([rcssbase/net/udpsocket.hpp],,[
-         		 AC_MSG_ERROR([The rcssbase headers (e.g. rcssbase/net/udpsocket.hpp) cannot be found. Please specify the location of the rcssbase installation, by using the RCSSBASE environment variable (e.g. ./configure RCSSBASE=$HOME/rcssbase)])])
- 
- 	AC_MSG_CHECKING([for the rcssnet library])
- 	rcss_tmp="$LDFLAGS"
- 	LDFLAGS="$LDFLAGS -lrcssnet"
-  	AC_LINK_IFELSE([int main() { return 0; }],
- 		       [AC_MSG_RESULT([yes])],
- 		       [AC_MSG_RESULT([no])
- 		        AC_MSG_ERROR([The rcssnet library (librcssnet.a or librcssnet.so) cannot be found. Please specify the location of the rcssbase installation using the RCSSBASE environment variable (e.g. ./configure RCSSBASE=$HOME/rcssbase)])])
- 	LDFLAGS="$rcss_tmp"
- ]) # RCSS_CHECK_RCSSBASE
- 
  # RCSS_CHECK_ODE
  #-----------------------------------------------------------------------------
--- 86,89 ----
***************
*** 222,226 ****
  	fi
  	RCSS_KEROSIN_IF_ELSE([
!                               AC_CHECK_HEADER([IL/il.h],,
                                RCSS_BUILD_KEROSIN_ERROR([DevIL headers not found. 
  Please set CPPFLAGS appropriately or you can specify the location of the DevIL installation using the DEVIL environment variable (e.g. ./configure DEVIL=$HOME/DevIL)]))
--- 200,204 ----
  	fi
  	RCSS_KEROSIN_IF_ELSE([
!                               AC_CHECK_HEADERS([IL/il.h],,
                                RCSS_BUILD_KEROSIN_ERROR([DevIL headers not found. 
  Please set CPPFLAGS appropriately or you can specify the location of the DevIL installation using the DEVIL environment variable (e.g. ./configure DEVIL=$HOME/DevIL)]))
***************
*** 371,380 ****
  ]) # RCSS_KEROSIN_IF_ELSE
  
! # AC_LIB_SPADES([ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
! # ---------------------------------------------------------
  # Checks for the spades library
! AC_DEFUN([AC_LIB_SPADES],
! [AS_VAR_PUSHDEF([ac_lib_spades], [ac_cv_lib_spades])dnl
! AC_CACHE_CHECK(whether the spades library is available, ac_cv_lib_spades,
                 [AC_LANG_PUSH(C++)
                  OLD_LDFLAGS="$LDFLAGS"
--- 349,380 ----
  ]) # RCSS_KEROSIN_IF_ELSE
  
! # RCSS_BUILD_SPADES_SERVER
! # 	set rcss_build_spades to 'yes'
! #-----------------------------------------------------------------------------
! AC_DEFUN([RCSS_BUILD_SPADES_SERVER], [
! 	# --enable-kerosin
! 	AC_ARG_ENABLE(spades,
! 		AC_HELP_STRING([--enable-spades=@<:@yes|no@:>@],       
! 	 		       [whether to compile the spades simulation engine server (default is no)]),
! 		    [rcss_build_spades="$enableval"],
! 		    [rcss_build_spades=no]
! 	)
! 	if test "$rcss_build_spades" = yes; then
! 		AC_MSG_NOTICE([Checking prerequisites for building the spades server...])
! 		RCSS_LIB_SPADES
! 	fi
! 	AM_CONDITIONAL(BUILD_SPADES, test x$rcss_build_spades = xyes)
! 	if test "$rcss_build_spades" = no; then
! 		AC_MSG_NOTICE([the spades server will not be build...]) 
! 		AC_MSG_NOTICE([...you can enable it using the --enable-spades flag])
! 	fi
! ]) # RCSS_BUILD_SPADES_SERVER
! 
! # RCSS_LIB_SPADES
  # Checks for the spades library
! # ---------------------------------------------------------
! AC_DEFUN([RCSS_LIB_SPADES],
! [AS_VAR_PUSHDEF([rcss_lib_spades], [rcss_cv_lib_spades])dnl
! AC_CACHE_CHECK(whether the spades library is available, rcss_cv_lib_spades,
                 [AC_LANG_PUSH(C++)
                  OLD_LDFLAGS="$LDFLAGS"
***************
*** 386,397 ****
                                      return 0;
                                  }],
!                                 [AS_VAR_SET(ac_lib_spades, yes)], 
!                                 [AS_VAR_SET(ac_lib_spades, no)])
                  LDFLAGS="$OLD_LDFLAGS"
                  AC_LANG_POP(C++)
                  ])
! AS_IF([test AS_VAR_GET(ac_lib_spades) = yes], [$1], [$2])
! AS_VAR_POPDEF([ac_lib_spades])dnl
! ])# AC_LIB_SPADES
  
  # RCSS_LIBRARY_VERSION_INFO
--- 386,396 ----
                                      return 0;
                                  }],
!                                 [AS_VAR_SET(rcss_lib_spades, yes)], 
!                                 [AS_VAR_SET(rcss_lib_spades, no)])
                  LDFLAGS="$OLD_LDFLAGS"
                  AC_LANG_POP(C++)
                  ])
! AS_VAR_POPDEF([rcss_lib_spades])dnl
! ])# RCSS_LIB_SPADES
  
  # RCSS_LIBRARY_VERSION_INFO