Index: /OpenSceneGraph/trunk/src/osgUtil/SceneView.cpp
===================================================================
--- /OpenSceneGraph/trunk/src/osgUtil/SceneView.cpp (revision 10764)
+++ /OpenSceneGraph/trunk/src/osgUtil/SceneView.cpp (revision 10765)
@@ -212,5 +212,5 @@
     if ((options & HEADLIGHT) || (options & SKY_LIGHT))
     {
-        #if !defined(OSG_GLES2_AVAILABLE)
+        #if defined(OSG_GL_FIXED_FUNCTION_AVAILABLE)
             _lightingMode=(options&HEADLIGHT) ? HEADLIGHT : SKY_LIGHT;
             _light = new osg::Light;
@@ -227,5 +227,5 @@
         #endif
         
-        #if !defined(OSG_GLES1_AVAILABLE) && !defined(OSG_GLES2_AVAILABLE)
+        #if !defined(OSG_GLES1_AVAILABLE) && !defined(OSG_GLES2_AVAILABLE) && defined(OSG_GL_FIXED_FUNCTION_AVAILABLE)
             osg::LightModel* lightmodel = new osg::LightModel;
             lightmodel->setAmbientIntensity(osg::Vec4(0.1f,0.1f,0.1f,1.0f));
@@ -273,5 +273,5 @@
     _globalStateSet->setGlobalDefaults();
 
-    #if !defined(OSG_GLES2_AVAILABLE)
+    #if defined(OSG_GL_FIXED_FUNCTION_AVAILABLE)
         // set up an texture environment by default to speed up blending operations.
          osg::TexEnv* texenv = new osg::TexEnv;
@@ -677,5 +677,5 @@
     if (_lightingMode!=NO_SCENEVIEW_LIGHT)
     {
-        #if !defined(OSG_GLES2_AVAILABLE)
+        #if defined(OSG_GL_FIXED_FUNCTION_AVAILABLE)
             // add GL_LIGHTING mode
             _globalStateSet->setMode(GL_LIGHTING, osg::StateAttribute::ON);
@@ -947,5 +947,5 @@
 #endif
 
-    #if !defined(OSG_GLES2_AVAILABLE)
+    #if defined(OSG_GL_FIXED_FUNCTION_AVAILABLE)
         switch(_lightingMode)
         {
Index: /OpenSceneGraph/trunk/src/osg/StateSet.cpp
===================================================================
--- /OpenSceneGraph/trunk/src/osg/StateSet.cpp (revision 10745)
+++ /OpenSceneGraph/trunk/src/osg/StateSet.cpp (revision 10765)
@@ -535,5 +535,5 @@
     setMode(GL_DEPTH_TEST,StateAttribute::ON);
 
-    #if !defined(OSG_GLES2_AVAILABLE)
+    #if defined(OSG_GL_FIXED_FUNCTION_AVAILABLE)
 
         // setAttributeAndModes(new AlphaFunc,StateAttribute::OFF);
Index: /OpenSceneGraph/trunk/src/osg/State.cpp
===================================================================
--- /OpenSceneGraph/trunk/src/osg/State.cpp (revision 10743)
+++ /OpenSceneGraph/trunk/src/osg/State.cpp (revision 10765)
@@ -47,5 +47,5 @@
     _modelView = _identity;
 
-    #if defined(OSG_GLES2_AVAILABLE) || defined(OSG_GL3_AVAILABLE)    
+    #if !defined(OSG_GL_FIXED_FUNCTION_AVAILABLE)
         _useModelViewAndProjectionUniforms = true;
         _useVertexAttributeAliasing = true;