diff -ruN a/acinclude.m4 b/acinclude.m4
--- a/acinclude.m4	2006-03-12 01:03:51.000000000 +0300
+++ b/acinclude.m4	2006-06-29 23:17:32.000000000 +0400
@@ -490,3 +490,18 @@
     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])
+
+	ogre_samples_dir="Samples"
+	if test "x$build_samples" != "xyes" ; then
+		ogre_samples_dir=""
+	fi
+	AC_SUBST(ogre_samples_dir)
+])
+
diff -ruN a/configure.in b/configure.in
--- a/configure.in	2006-06-11 01:37:20.000000000 +0400
+++ b/configure.in	2006-06-29 22:46:48.000000000 +0400
@@ -64,6 +64,7 @@
 OGRE_CHECK_CG
 OGRE_CHECK_OPENEXR
 OGRE_CHECK_DX9
+OGRE_CHECK_SAMPLES
 
 dnl Detect endianness
 OGRE_DETECT_ENDIAN
diff -ruN a/Makefile.am b/Makefile.am
--- a/Makefile.am	2004-12-20 03:15:52.000000000 +0300
+++ b/Makefile.am	2006-06-29 22:57:26.000000000 +0400
@@ -1,4 +1,4 @@
-SUBDIRS = OgreMain PlatformManagers PlugIns RenderSystems Samples Tools Tests
+SUBDIRS = OgreMain PlatformManagers PlugIns RenderSystems @ogre_samples_dir@ Tools Tests
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = OGRE.pc