Changeset 17918 in vbox for trunk/configure

Timestamp:

Mar 16, 2009 11:15:50 AM (16 years ago)

Author:

vboxsync

Message:

configure: error check

File:

• trunk/configure (modified) (4 diffs)

trunk/configure

@@ -134 +134 @@
 cleanup()
 {
-  rm -f $ODIR.tmp_src.cc $ODIR.tmp_src.c $ODIR.tmp_out $ODIR.test_execute.log
+#  rm -f $ODIR.tmp_src.cc $ODIR.tmp_src.c $ODIR.tmp_out $ODIR.test_execute.log
+echo "cleanup"
 }
 
@@ -229 +230 @@
   echo "using the following command line:" >> $LOG
   echo "$CXX -O -Wall -o $ODIR.tmp_out $ODIR.tmp_src.cc \"$1\"" >> $LOG
-  $CXX -O -Wall -o $ODIR.tmp_out $ODIR.tmp_src.cc $1 >> $LOG 2>&1
+  $CXX -g -O -Wall -o $ODIR.tmp_out $ODIR.tmp_src.cc $1 >> $LOG 2>&1
   if [ $? -ne 0 ]; then
     if [ -z "$4" ]; then
@@ -1212 +1213 @@
 
   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);
+  if (dpy)
+  {
+    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;
 }
@@ -1245 +1249 @@
 
   dpy = XOpenDisplay(NULL);
-  if (glXQueryVersion(dpy, &major, &minor))
+  if (dpy)
   {
-    printf("found version %u.%u, OK.\n", major, minor);
+    if (glXQueryVersion(dpy, &major, &minor))
+    {
+      printf("found version %u.%u, OK.\n", major, minor);
+      return 0;
+    }
   }
+  printf("found (inactive), OK.\n");
   return 0;
 }