Menu
▾
▴
[simspark-cvs] simspark/spark acinclude.m4,1.4.2.1,1.4.2.2
|
From: Oliver O. <fr...@us...> - 2007-02-28 04:46:55
|
Update of /cvsroot/simspark/simspark/spark In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv24531 Modified Files: Tag: WIN32 acinclude.m4 Log Message: - fixed all graphic related checks to work with Mac OS X Index: acinclude.m4 =================================================================== RCS file: /cvsroot/simspark/simspark/spark/acinclude.m4,v retrieving revision 1.4.2.1 retrieving revision 1.4.2.2 diff -C2 -d -r1.4.2.1 -r1.4.2.2 *** acinclude.m4 13 Feb 2007 00:01:49 -0000 1.4.2.1 --- acinclude.m4 28 Feb 2007 04:46:52 -0000 1.4.2.2 *************** *** 26,30 **** [RUBY_CPPFLAGS=''], [unset ac_cv_header_ruby_h ! ruby_tmp=$CPPFLAGS ruby_includedir=`$RUBY -rrbconfig -e "print Config::CONFIG[['archdir']]"` AC_MSG_NOTICE(trying again in $ruby_includedir) --- 26,30 ---- [RUBY_CPPFLAGS=''], [unset ac_cv_header_ruby_h ! ruby_tmp_cppflags=$CPPFLAGS ruby_includedir=`$RUBY -rrbconfig -e "print Config::CONFIG[['archdir']]"` AC_MSG_NOTICE(trying again in $ruby_includedir) *************** *** 34,38 **** [AC_MSG_ERROR(check your ruby installation)] ) ! CPPFLAGS=$ruby_tmp ] ) --- 34,38 ---- [AC_MSG_ERROR(check your ruby installation)] ) ! CPPFLAGS=$ruby_tmp_cppflags ] ) *************** *** 50,54 **** AC_MSG_CHECKING([for libruby]) ! rcss_tmp="$LDFLAGS" LDFLAGS="$LDFLAGS $RUBY_LDFLAGS" AC_LINK_IFELSE([int main() { return 0; }], --- 50,54 ---- AC_MSG_CHECKING([for libruby]) ! rcss_tmp_ldflags="$LDFLAGS" LDFLAGS="$LDFLAGS $RUBY_LDFLAGS" AC_LINK_IFELSE([int main() { return 0; }], *************** *** 57,61 **** AC_MSG_ERROR([libruby cannot be found. If you compile ruby on your own, make sure to configure ruby with '--enable-shared' to create the library.])]) ! LDFLAGS="$rcss_tmp" # Substitute Makefile Vars. --- 57,61 ---- AC_MSG_ERROR([libruby cannot be found. If you compile ruby on your own, make sure to configure ruby with '--enable-shared' to create the library.])]) ! LDFLAGS="$rcss_tmp_ldflags" # Substitute Makefile Vars. *************** *** 144,156 **** #----------------------------------------------------------------------------- AC_DEFUN([RCSS_CHECK_GL], [ ! AC_CHECK_HEADERS([OpenGL/gl.h GLUT/glut.h], [iamamac=yes], [iamamac=no]) AC_MSG_CHECKING([if I am a Mac]) ! if test "$iamamac" = "yes"; then ! AC_MSG_RESULT([yes!]) RCSS_KEROSIN_IF_ELSE([ # checking if linking against libGL succeeds AC_MSG_CHECKING([if linking against libGL succeeds]) ! rcss_tmp="$LDFLAGS" LDFLAGS="$LDFLAGS -framework GLUT -framework OpenGL" AC_LINK_IFELSE([#include <OpenGL/gl.h> int main() { glColor3f(0,0,0); }], --- 144,157 ---- #----------------------------------------------------------------------------- AC_DEFUN([RCSS_CHECK_GL], [ ! AC_CHECK_HEADERS([OpenGL/gl.h GLUT/glut.h], [rcss_iamamac=yes], [rcss_iamamac=no]) AC_MSG_CHECKING([if I am a Mac]) ! if test "$rcss_iamamac" = "yes"; then ! AC_MSG_RESULT([yes]) RCSS_KEROSIN_IF_ELSE([ # checking if linking against libGL succeeds AC_MSG_CHECKING([if linking against libGL succeeds]) ! rcss_tmp_ldflags="$LDFLAGS" LDFLAGS="$LDFLAGS -framework GLUT -framework OpenGL" + GL_LIBADD="" AC_LINK_IFELSE([#include <OpenGL/gl.h> int main() { glColor3f(0,0,0); }], *************** *** 158,162 **** [AC_MSG_RESULT([no]) RCSS_BUILD_KEROSIN_ERROR([to build libkerosin, set LDFLAGS so that libGL can be found])]) ! LDFLAGS="$rcss_tmp" AC_MSG_CHECKING([if linking against libglut succeeds]) LDFLAGS="$LDFLAGS -framework GLUT -framework OpenGL" --- 159,163 ---- [AC_MSG_RESULT([no]) RCSS_BUILD_KEROSIN_ERROR([to build libkerosin, set LDFLAGS so that libGL can be found])]) ! LDFLAGS="$rcss_tmp_ldflags" AC_MSG_CHECKING([if linking against libglut succeeds]) LDFLAGS="$LDFLAGS -framework GLUT -framework OpenGL" *************** *** 167,171 **** RCSS_BUILD_KEROSIN_ERROR([to build libkerosin, set LDFLAGS so that libglut or can be found]) ]) ! LDFLAGS="$rcss_tmp" ]) else --- 168,172 ---- RCSS_BUILD_KEROSIN_ERROR([to build libkerosin, set LDFLAGS so that libglut or can be found]) ]) ! LDFLAGS="$rcss_tmp_ldflags" ]) else *************** *** 174,179 **** RCSS_KEROSIN_IF_ELSE([ AC_MSG_CHECKING([if linking against libGL succeeds]) ! rcss_tmp="$LDFLAGS" LDFLAGS="$LDFLAGS -lGL" AC_LINK_IFELSE([#include <GL/gl.h> int main() { glColor3f(0,0,0); }], --- 175,181 ---- RCSS_KEROSIN_IF_ELSE([ AC_MSG_CHECKING([if linking against libGL succeeds]) ! rcss_tmp_ldflags="$LDFLAGS" LDFLAGS="$LDFLAGS -lGL" + GL_LIBADD="-lGL" AC_LINK_IFELSE([#include <GL/gl.h> int main() { glColor3f(0,0,0); }], *************** *** 181,185 **** [AC_MSG_RESULT([no]) RCSS_BUILD_KEROSIN_ERROR([to build libkerosin, set LDFLAGS so that libGL can be found])]) ! LDFLAGS="$rcss_tmp" AC_MSG_CHECKING([if linking against libglut succeeds]) LDFLAGS="$LDFLAGS -lGL -lGLU -lglut" --- 183,187 ---- [AC_MSG_RESULT([no]) RCSS_BUILD_KEROSIN_ERROR([to build libkerosin, set LDFLAGS so that libGL can be found])]) ! LDFLAGS="$rcss_tmp_ldflags" AC_MSG_CHECKING([if linking against libglut succeeds]) LDFLAGS="$LDFLAGS -lGL -lGLU -lglut" *************** *** 190,196 **** RCSS_BUILD_KEROSIN_ERROR([to build libkerosin, set LDFLAGS so that libglut or can be found]) ]) ! LDFLAGS="$rcss_tmp" ]) fi ]) # RCSS_CHECK_GL --- 192,199 ---- RCSS_BUILD_KEROSIN_ERROR([to build libkerosin, set LDFLAGS so that libglut or can be found]) ]) ! LDFLAGS="$rcss_tmp_ldflags" ]) fi + AC_SUBST(GL_LIBADD) ]) # RCSS_CHECK_GL *************** *** 217,226 **** AC_MSG_WARN([To enable image support, 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)])]) ]) ! if test "$rcss_tmp" = "no"; then ! IL_LIBADD="" ! else ! IL_LIBADD="-lIL" RCSS_KEROSIN_IF_ELSE([rcss_tmp="$LDFLAGS" ! LDFLAGS="$LDFLAGS -lIL" AC_LINK_IFELSE([#include <IL/il.h> #include <stdarg.h> /* _vsnprintf may be undefined (and it is needed by libIL) */ --- 220,233 ---- AC_MSG_WARN([To enable image support, 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)])]) ]) ! IL_LIBADD="" ! if test "$rcss_tmp" != "no"; then ! if test "$rcss_iamamac" = "yes"; then ! rcss_ld="-framework IL" ! else ! IL_LIBADD="-lIL" ! rcss_ld="-lIL" ! fi RCSS_KEROSIN_IF_ELSE([rcss_tmp="$LDFLAGS" ! LDFLAGS="$LDFLAGS $rcss_ld" AC_LINK_IFELSE([#include <IL/il.h> #include <stdarg.h> /* _vsnprintf may be undefined (and it is needed by libIL) */ *************** *** 253,280 **** Please set CPPFLAGS appropriately or you can specify the location of the SDL installation using the SDL environment variable (e.g. ./configure SDL=$HOME/SDL)])) ]) RCSS_KEROSIN_IF_ELSE([ ! rcss_tmp="$LDFLAGS" ! LDFLAGS="$LDFLAGS -lSDL" AC_LINK_IFELSE([#include <SDL/SDL.h> ! int main() { return SDL_Init(0); }],, RCSS_BUILD_KEROSIN_ERROR([The SDL library (libSDL.a or libSDL.so) cannot be found. Please set LDFLAGS appropriately or you can specify the location of the SDL installation using the SDL environment variable (e.g. ./configure SDL=$HOME/SDL)])) ! LDFLAGS="$rcss_tmp" ]) - - ]) # RCSS_CHECK_SDL # RCSS_CHECK_SLANG #----------------------------------------------------------------------------- AC_DEFUN([RCSS_CHECK_SLANG], [ RCSS_KEROSIN_IF_ELSE([ ! rcss_tmp="$LDFLAGS" LDFLAGS="$LDFLAGS -lslang" AC_LINK_IFELSE([int main() { return 0; }],, RCSS_BUILD_KEROSIN_ERROR([The S-Lang library (libslang.a or libslang.so) cannot be found. Please set LDFLAGS appropriately.])) ! LDFLAGS="$rcss_tmp" ]) ]) # RCSS_CHECK_SLANG --- 260,312 ---- Please set CPPFLAGS appropriately or you can specify the location of the SDL installation using the SDL environment variable (e.g. ./configure SDL=$HOME/SDL)])) ]) + RCSS_CREATE_LIBSDLMAIN + + if test "$rcss_iamamac" = "yes"; then + rcss_cpp_add="-I/Library/Frameworks/SDL.framework/Headers" + rcss_ld_add="-framework SDL -framework Cocoa $srcdir/macosX/libSDLmain.a" + SDL_LIBADD="" + else + rcss_cpp_add="" + rcss_ld_add="-lSDL" + SDL_LIBADD="-lSDL" + fi + AC_SUBST(SDL_LIBADD) RCSS_KEROSIN_IF_ELSE([ ! rcss_tmp_ldflags="$LDFLAGS" ! rcss_tmp_cppflags="$CPPFLAGS" ! CPPFLAGS="$CPPFLAGS $rcss_cpp_add" ! LDFLAGS="$LDFLAGS $rcss_ld_add" AC_LINK_IFELSE([#include <SDL/SDL.h> ! extern "C" int main(int argc, char **argv) { return SDL_Init(0); }],, RCSS_BUILD_KEROSIN_ERROR([The SDL library (libSDL.a or libSDL.so) cannot be found. Please set LDFLAGS appropriately or you can specify the location of the SDL installation using the SDL environment variable (e.g. ./configure SDL=$HOME/SDL)])) ! LDFLAGS="$rcss_tmp_ldflags" ! CPPFLAGS="$rcss_tmp_cppflags" ]) ]) # RCSS_CHECK_SDL + # RCSS_CREATE_LIBSDLMAIN + #----------------------------------------------------------------------------- + AC_DEFUN([RCSS_CREATE_LIBSDLMAIN], [ + if test "$rcss_iamamac" = "yes"; then + AC_MSG_NOTICE([Creating libsdlmain.a...]) + $CC -I/Library/Frameworks/SDL.framework/Headers -o $srcdir/macosX/SDLMain.o -c $srcdir/macosX/SDLMain.m + $AR -rcs $srcdir/macosX/libSDLmain.a $srcdir/macosX/SDLMain.o + fi + ]) # RCSS_CREATE_LIBSDLMAIN + # RCSS_CHECK_SLANG #----------------------------------------------------------------------------- AC_DEFUN([RCSS_CHECK_SLANG], [ + if test "$rcss_iamamac" = "no"; then RCSS_KEROSIN_IF_ELSE([ ! rcss_tmp_ldflags="$LDFLAGS" LDFLAGS="$LDFLAGS -lslang" AC_LINK_IFELSE([int main() { return 0; }],, RCSS_BUILD_KEROSIN_ERROR([The S-Lang library (libslang.a or libslang.so) cannot be found. Please set LDFLAGS appropriately.])) ! LDFLAGS="$rcss_tmp_ldflags" ]) + fi ]) # RCSS_CHECK_SLANG *************** *** 451,454 **** ])# RCSS_BOOST_REGEX - - --- 483,484 ---- |
