Print

Print


Commit in SimDist on MAIN
configure+24-201.84 -> 1.85
configure.in+6-31.11 -> 1.12
build/ogl.m4+2-11.6 -> 1.7
+32-24
3 modified files
fix option to disable opengl so it actually works

SimDist
configure 1.84 -> 1.85
diff -u -r1.84 -r1.85
--- configure	20 Aug 2010 22:38:39 -0000	1.84
+++ configure	23 Aug 2010 17:45:58 -0000	1.85
@@ -2462,6 +2462,29 @@
 
 
 
+echo "$as_me:$LINENO: checking whether to use OpenGL" >&5
+echo $ECHO_N "checking whether to use OpenGL... $ECHO_C" >&6
+
+# Check whether --enable-opengl or --disable-opengl was given.
+if test "${enable_opengl+set}" = set; then
+  enableval="$enable_opengl"
+
+fi;
+
+if test "${enable_opengl}" != "no"; then
+  echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+else
+  DISABLE_OPENGL=1
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+
+if test -z "$DISABLE_OPENGL"
+then
+
+
 
 # Check whether --with-opengl or --without-opengl was given.
 if test "${with_opengl+set}" = set; then
@@ -2523,7 +2546,7 @@
 
 if test -z "$OGLHOME"
 then
-    { { echo "$as_me:$LINENO: error: valid OpenGL installation not found" >&5
+  { { echo "$as_me:$LINENO: error: valid OpenGL installation not found" >&5
 echo "$as_me: error: valid OpenGL installation not found" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -2531,29 +2554,10 @@
 
 
 
-
-
-echo "$as_me:$LINENO: checking whether to use OpenGL" >&5
-echo $ECHO_N "checking whether to use OpenGL... $ECHO_C" >&6
-
-# Check whether --enable-opengl or --disable-opengl was given.
-if test "${enable_opengl+set}" = set; then
-  enableval="$enable_opengl"
-
-fi;
-
-if test "${enable_opengl}" != "no"; then
-  echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
 fi
 
 
 
-
-
 echo "$as_me:$LINENO: checking whether to set G4VERBOSE" >&5
 echo $ECHO_N "checking whether to set G4VERBOSE... $ECHO_C" >&6
 

SimDist
configure.in 1.11 -> 1.12
diff -u -r1.11 -r1.12
--- configure.in	17 Aug 2010 19:09:57 -0000	1.11
+++ configure.in	23 Aug 2010 17:45:58 -0000	1.12
@@ -1,4 +1,4 @@
-dnl $Header: /cvs/lcd/SimDist/configure.in,v 1.11 2010/08/17 19:09:57 jeremy Exp $
+dnl $Header: /cvs/lcd/SimDist/configure.in,v 1.12 2010/08/23 17:45:58 jeremy Exp $
 dnl
 dnl Process this file with autoconf to produce the configure script for SimDist.
 dnl
@@ -36,9 +36,12 @@
 AC_INIT_SIMDIST
 
 dnl Set OpenGL settings.
-AC_WITH_OPENGL
-AC_OPENGL
 AC_ENABLE_OPENGL
+if test -z "$DISABLE_OPENGL"
+then
+  AC_WITH_OPENGL
+  AC_OPENGL
+fi
 
 dnl Set G4VERBOSE mode.
 AC_ENABLE_G4VERBOSE

SimDist/build
ogl.m4 1.6 -> 1.7
diff -u -r1.6 -r1.7
--- ogl.m4	17 Aug 2010 19:09:58 -0000	1.6
+++ ogl.m4	23 Aug 2010 17:45:58 -0000	1.7
@@ -35,7 +35,7 @@
 
 if test -z "$OGLHOME"
 then
-    AC_MSG_ERROR(valid OpenGL installation not found)
+  AC_MSG_ERROR(valid OpenGL installation not found)
 fi
 
 AC_SUBST(OGLHOME)
@@ -54,6 +54,7 @@
 if test "${enable_opengl}" != "no"; then
   AC_MSG_RESULT(yes)
 else
+  DISABLE_OPENGL=1
   AC_MSG_RESULT(no)
 fi
 
CVSspam 0.2.8