From: Oliver O. <fr...@us...> - 2007-07-24 05:00:45
|
Update of /cvsroot/simspark/simspark/spark In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv13245 Modified Files: Tag: projectx acinclude.m4 Log Message: some checks for the MacOS platform Index: acinclude.m4 =================================================================== RCS file: /cvsroot/simspark/simspark/spark/acinclude.m4,v retrieving revision 1.4.2.2.2.2 retrieving revision 1.4.2.2.2.3 diff -C2 -d -r1.4.2.2.2.2 -r1.4.2.2.2.3 *** acinclude.m4 17 Jun 2007 12:08:34 -0000 1.4.2.2.2.2 --- acinclude.m4 24 Jul 2007 05:00:35 -0000 1.4.2.2.2.3 *************** *** 146,149 **** --- 146,151 ---- AC_CHECK_HEADERS([OpenGL/gl.h GLUT/glut.h], [rcss_iamamac=yes], [rcss_iamamac=no]) AC_MSG_CHECKING([if I am a Mac]) + AM_CONDITIONAL(BUNDLE_SUPPORT, test x$rcss_iamamac = xyes) + AC_SUBST(bundle_support, $rcss_iamamac) if test "$rcss_iamamac" = "yes"; then AC_MSG_RESULT([yes]) *************** *** 209,212 **** --- 211,216 ---- #----------------------------------------------------------------------------- AC_DEFUN([RCSS_CHECK_DEVIL], [ + rcss_IL_LIBADD="" + rcss_IL_LDFLAGS="" AC_ARG_VAR(DEVIL, [location of DevIL installation]) if test $DEVIL; then *************** *** 223,226 **** --- 227,231 ---- if test "$rcss_tmp" != "no"; then if test "$rcss_iamamac" = "yes"; then + IL_LIBADD="-framework IL" rcss_ld="-framework IL" else *************** *** 362,368 **** AC_ARG_ENABLE(kerosin, AC_HELP_STRING([--enable-kerosin=@<:@yes|no@:>@], ! [whether to compile libkerosin (default is no)]), [rcss_build_kerosin="$enableval"], ! [rcss_build_kerosin=no] ) if test "$rcss_build_kerosin" = yes; then --- 367,373 ---- AC_ARG_ENABLE(kerosin, AC_HELP_STRING([--enable-kerosin=@<:@yes|no@:>@], ! [whether to compile libkerosin (default is yes)]), [rcss_build_kerosin="$enableval"], ! [rcss_build_kerosin=yes] ) if test "$rcss_build_kerosin" = yes; then |