Commit fd4265d9 authored by Bruce Allen's avatar Bruce Allen

fixes from Reinhard Prix to disable building of boincglut under

Darwin/Unix.  It's only needed under Windows. Also warn user if
GLUT libraries missing, and then build only non-graphical client
side code.

svn path=/trunk/boinc/; revision=4954
parent 9c1fb7a9
......@@ -16,10 +16,6 @@ if ENABLE_CLIENT
CLIENT_SUBDIRS = client
endif
if BUILD_BOINCGLUT
BOINCGLUT_SUBDIR = boincglut
endif
if BUILD_CLIENTGUI
CLIENTGUI_SUBDIRS = clientgui
endif
......
......@@ -3,6 +3,9 @@
include $(top_srcdir)/Makefile.incl
AM_CFLAGS = @GLUT_CFLAGS@
AM_LDFLAGS = @GLUT_LIBS@
api_files= \
boinc_api.C
......
......@@ -21911,9 +21911,20 @@ David 27 Dec 2004
main.C
sched_send.C
David 27 Oct 2004
David 27 Dec 2004
- web fixes from Eric Myers
html/inc
cache.inc
forum.inc
Bruce 28 Dec 2004
- fixes from Reinhard Prix to disable building of boincglut under
Darwin/Unix. It's only needed under Windows. Also warn user if
GLUT libraries missing, and then build only non-graphical client
side code.
Makefile.am
configure.ac
api/
configure.ac
......@@ -155,26 +155,33 @@ dnl check for GL library
AX_CHECK_GL
AX_CHECK_GLU
AX_CHECK_GLUT
if test "$no_gl" = yes -o "$no_glu" = yes ; then
if test "$no_gl" = yes -o "$no_glu" = yes -o "$no_glut" = yes; then
have_glut=no
AC_MSG_WARN([
================================================================================
WARNING: openGL not found.
WARNING: openGL/GLU/glut not found.
The GL and GLU libraries are required in order to build the graphical parts
The GL, GLU and glut libraries are required in order to build the graphical parts
of the BOINC application API library.
==> only building non-graphical parts of the BOINC API Library for now.
NOTE: on MacOS X/Darwin you might consider running configure withe the option
'./configure --with-apple-opengl-framework'
in order to use the Mac-native openGL framework
================================================================================
])
else
AC_CHECK_HEADERS([gl.h glu.h glut.h glaux.h GL/gl.h GL/glu.h GL/glut.h GL/glaux.h OpenGL/gl.h OpenGL/glu.h OpenGL/glut.h OpenGL/glaux.h GLUT/glut.h MesaGL/gl.h MesaGL/glu.h MesaGL/glut.h MesaGL/glaux.h])
have_glut=yes
echo "DEBUG: GLUT_CFLAGS = $GLUT_CFLAGS"
echo "DEBUG: GLUT_LIBS = $GLUT_LIBS"
AC_CHECK_HEADERS([gl.h glu.h glut.h glaux.h GL/gl.h GL/glu.h GL/glut.h GL/glaux.h OpenGL/gl.h OpenGL/glu.h OpenGL/glut.h OpenGL/glaux.h GLUT/glut.h MesaGL/gl.h MesaGL/glu.h MesaGL/glut.h MesaGL/glaux.h])
fi
AM_CONDITIONAL(BUILD_GRAPHICS_API, [ test "$have_glut" = yes ])
AM_CONDITIONAL(BUILD_BOINCGLUT, [ /bin/false ])
dnl --------------------------------------------------------------------------------
AC_CHECK_LIB(socket, setservent)
......@@ -335,14 +342,6 @@ dnl fi
dnl echo "checking static flags... ${STATIC_FLAGS:-(none)}"]
dnl AC_SUBST(STATIC_FLAGS)
# If you still want to build boincglut, include these into the file list below
# boincglut/include/Makefile
# boincglut/lib/glut/Makefile
# boincglut/lib/Makefile
# boincglut/Makefile
AC_CONFIG_FILES([
./version.h
api/Makefile
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment