Attachment #109451 for bug #138093




    esac
    AC_SUBST(OGRE_THREAD_LIBS)
])

AC_DEFUN([OGRE_CHECK_SAMPLES],
[
	AC_ARG_ENABLE(samples,
              AC_HELP_STRING([--disable-samples], [Do not build samples]),
              [build_samples=$enableval],
              [build_samples=yes])
	AM_CONDITIONAL([BUILD_SAMPLES], [test "x$build_samples" != "xyes"])
])


Lines 64-69 Link Here

(-)ogrenew.orig/configure.in (+1 lines)
64	OGRE_CHECK_CG	64	OGRE_CHECK_CG
65	OGRE_CHECK_OPENEXR	65	OGRE_CHECK_OPENEXR
66	OGRE_CHECK_DX9	66	OGRE_CHECK_DX9
		67	OGRE_CHECK_SAMPLES
67		68
68	dnl Detect endianness	69	dnl Detect endianness
69	OGRE_DETECT_ENDIAN	70	OGRE_DETECT_ENDIAN

Lines 1-5 Link Here

(-)ogrenew.orig/Samples/Makefile.am (-3 / +6 lines)
1	SUBDIRS = SkeletalAnimation BezierPatch EnvMapping Transpacency Lighting \	1	SUBDIRS = Common
2	ParticleFX TextureFX SkyDome BSP Common SkyPlane SkyBox CameraTrack Terrain \	2
		3	if BUILD_SAMPLES
		4	SUBDIRS += SkeletalAnimation BezierPatch EnvMapping Transpacency Lighting \
		5	ParticleFX TextureFX SkyDome BSP SkyPlane SkyBox CameraTrack Terrain \
3	RenderToTexture Water CubeMapping Dot3Bump Smoke CelShading Fresnel Shadows \	6	RenderToTexture Water CubeMapping Dot3Bump Smoke CelShading Fresnel Shadows \
4	DynTex VolumeTex Grass DeferredShading	7	DynTex VolumeTex Grass DeferredShading
5		8
Lines 7-10 Link Here
7	SUBDIRS += Gui FacialAnimation OceanDemo Compositor	10	SUBDIRS += Gui FacialAnimation OceanDemo Compositor
8	endif	11	endif
9		12
10		13	endif

Return to bug 138093

Lines 493-495 Link Here

(-)ogrenew.orig/acinclude.m4 (+10 lines)
493	esac	493	esac
494	AC_SUBST(OGRE_THREAD_LIBS)	494	AC_SUBST(OGRE_THREAD_LIBS)
495	])	495	])
		496
		497	AC_DEFUN([OGRE_CHECK_SAMPLES],
		498	[
		499	AC_ARG_ENABLE(samples,
		500	AC_HELP_STRING([--disable-samples], [Do not build samples]),
		501	[build_samples=$enableval],
		502	[build_samples=yes])
		503	AM_CONDITIONAL([BUILD_SAMPLES], [test "x$build_samples" != "xyes"])
		504	])
		505