Changeset 17912 in vbox

Timestamp:

Mar 16, 2009 10:48:01 AM (16 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

44474

Message:

configure: check for OpenGL stuff

Location:

trunk

Files:

• Config.kmk (modified) (1 diff)
• configure (modified) (11 diffs)

trunk/Config.kmk

@@ -355 +355 @@
  VBOX_WITH_CROGL = 1
 endif
-# Enable OpenGL service
-VBOX_WITH_OGL = 1
 # Enable shared folders
 VBOX_WITH_SHARED_FOLDERS = 1

trunk/configure

@@ -4 +4 @@
 
 #
-# Copyright (C) 2006-2007 Sun Microsystems, Inc.
+# Copyright (C) 2006-2009 Sun Microsystems, Inc.
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
@@ -68 +68 @@
 WITH_DBUS=1
 WITH_KMODS=1
+WITH_OPENGL=1
 WITH_HARDENING=1
 CC="gcc"
@@ -92 +93 @@
 INCX11="/usr/local/include"
 LIBXCURSOR="-lXcursor"
+LIBXMU="-lXmu"
+MESA="-lGL"
 INCZ=""
 LIBZ="-lz"
@@ -216 +219 @@
 
 # Compile a test
+#  $1   compile flags/libs
+#  $2   library name
+#  $3   package name
+#  $4   if this argument is 'nofatal', don't abort
 test_compile()
 {
@@ -1131 +1138 @@
 
 #
+# Check for the X libraries (Xext, X11)
+#
+check_x()
+{
+  test_header "X libraries"
+  cat > $ODIR.tmp_src.cc << EOF
+#include <cstdio>
+#include <X11/Xlib.h>
+extern "C" int main(void)
+{
+  Display *dpy;
+  int scrn_num;
+  Screen *scrn;
+  Window win;
+
+  dpy      = XOpenDisplay(NULL);
+  scrn_num = DefaultScreen(dpy);
+  scrn     = ScreenOfDisplay(dpy, scrn_num);
+  win      = XCreateWindow(dpy, RootWindowOfScreen(scrn), 0, 0, 100, 100,
+                           0, 16, InputOutput, CopyFromParent, 0, NULL);
+  XDestroyWindow(dpy, win);
+}
+EOF
+  [ -n "$INCX11" ] && I_INCX11=`prefix_I "$INCX11"`
+  if test_compile "$LIBX11 $I_INCX11" Xlibs Xlibs; then
+    log_success "found"
+  fi
+}
+
+
+#
 # Check for the Xcursor library, needed by VBoxSDL and VBoxBFE
 #
@@ -1156 +1194 @@
 
 #
-# Check for the X libraries (Xext, X11)
-#
-check_x()
-{
-  test_header "X libraries"
+# Check for the Xmu library, needed by OpenGL
+#
+check_xmu()
+{
+  test_header Xmu
+  cat > $ODIR.tmp_src.cc << EOF
+#include <cstdio>
+#include <X11/Xatom.h>
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+#include <X11/Xmu/StdCmap.h>
+extern "C" int main(void)
+{
+  Display *dpy;
+  int scrn_num;
+  Screen *scrn;
+
+  dpy = XOpenDisplay(NULL);
+  scrn_num = DefaultScreen(dpy);
+  scrn     = ScreenOfDisplay(dpy, scrn_num);
+  Status status = XmuLookupStandardColormap(dpy, RootWindowOfScreen(scrn), 0,
+                  24, XA_RGB_DEFAULT_MAP, False, True);
+  printf("Status = %x\n", status);
+  return 0;
+}
+EOF
+  [ -n "$INCX11" ] && I_INCX11=`prefix_I "$INCX11"`
+  if test_compile "$LIBX11 $LIBXMU $I_INCX11" Xmu Xmu; then
+    log_success "found"
+    cnf_append "VBOX_XMU_LIBS" "`strip_l "$LIBXMU"`"
+  fi
+}
+
+
+#
+# Check for Mesa, needed by OpenGL
+#
+check_mesa()
+{
+  test_header "Mesa / GLU"
   cat > $ODIR.tmp_src.cc << EOF
 #include <cstdio>
 #include <X11/Xlib.h>
+#include <GL/glx.h>
+#include <GL/glu.h>
 extern "C" int main(void)
 {
   Display *dpy;
-  int scrn_num;
-  Screen *scrn;
-  Window win;
-
-  dpy      = XOpenDisplay(NULL);
-  scrn_num = DefaultScreen(dpy);
-  scrn     = ScreenOfDisplay(dpy, scrn_num);
-  win      = XCreateWindow(dpy, RootWindowOfScreen(scrn), 0, 0, 100, 100,
-                           0, 16, InputOutput, CopyFromParent, 0, NULL);
-  XDestroyWindow(dpy, win);
+  int major, minor;
+
+  dpy = XOpenDisplay(NULL);
+  if (glXQueryVersion(dpy, &major, &minor))
+  {
+    printf("found version %u.%u, OK.\n", major, minor);
+  }
+  return 0;
 }
 EOF
   [ -n "$INCX11" ] && I_INCX11=`prefix_I "$INCX11"`
-  if test_compile "$LIBX11 $I_INCX11" Xlibs Xlibs; then
-    log_success "found"
+  if test_compile "$LIBX11 $MESA $I_INCX11" Mesa Mesa; then
+    test_execute
   fi
 }
@@ -1737 +1810 @@
   --disable-kmods          don't build Linux kernel modules (host and guest)
   --disable-hardening      don't be strict about /dev/vboxdrv access
+  --disable-opengl         disable OpenGL support
   --enable-webservice      enable the webservice stuff
   --build-libxml2          build libxml2 from sources
@@ -1840 +1914 @@
       WITH_KMODS=0
       ;;
+    --disable-opengl)
+      WITH_OPENGL=0
+      ;;
     --disable-hardening)
       WITH_HARDENING=0
@@ -1866 +1943 @@
       WITH_SDL_TTF=0
       WITH_X11=0
+      WITH_OPENGL=0
       WITH_QT4=0
       ;;
@@ -1989 +2067 @@
 fi
 
+if [ $WITH_OPENGL -eq 0 ]; then
+  cnf_append "VBOX_WITH_CROGL" ""
+fi
+
 if [ "$OS" = "darwin" ]; then
   # On Darwin we want to build against Qt4 only. WITH_QT4 is enabled by
@@ -2030 +2112 @@
 [ $WITH_SDL_TTF -eq 1 -a $OSE -eq 0 ] && check_sdl_ttf
 [ $WITH_X11    -eq 1 ] && check_x
-# TODO check for Xmu (X11/Xmu/StdCmap.h)
-# TODO check for mesa-common-dev (GL/glx.h)
-# TODO check for libglu1-mesa-dev (GL/glu.h)
-# TODO check for xcomposite-dev (X11/extensions/Xcomposite.h)
-# TODO check for libxdamange-dev (X11/extensions/Xdamage.h)
+# TODO check for xcomposite-dev (X11/extensions/Xcomposite.h, additions only)
+# TODO check for libxdamange-dev (X11/extensions/Xdamage.h, additions only)
 [ $WITH_X11    -eq 1 ] && check_xcursor
+[ $WITH_OPENGL -eq 1 ] && check_xmu
+[ $WITH_OPENGL -eq 1 ] && check_mesa
 [ $WITH_QT4    -eq 1 ] && check_qt4
 [ $WITH_PYTHON -eq 1 -a "$OS" != "darwin" ] && check_python