[xiph-commits] r13242 - trunk/theora

[giles at svn.xiph.org]

Author: giles
Date: 2007-07-10 11:49:18 -0700 (Tue, 10 Jul 2007)
New Revision: 13242

Modified:
   trunk/theora/Makefile.am
   trunk/theora/configure.ac
Log:
Allow configure-type disable of building the example code. Mostly to
work around dependency breakage detection. After a patch by Matthias 
Schneider.


Modified: trunk/theora/Makefile.am
===================================================================
--- trunk/theora/Makefile.am	2007-07-10 18:37:36 UTC (rev 13241)
+++ trunk/theora/Makefile.am	2007-07-10 18:49:18 UTC (rev 13242)
@@ -2,8 +2,14 @@
 
 AUTOMAKE_OPTIONS = foreign 1.6 dist-zip dist-bzip2
 
-SUBDIRS = lib include doc examples tests m4
+THEORA_ENABLE_EXAMPLES=@THEORA_ENABLE_EXAMPLES@
 
+SUBDIRS = lib include doc tests m4
+
+if THEORA_ENABLE_EXAMPLES
+SUBDIRS += examples
+endif
+
 # we include the whole debian/ dir in EXTRA_DIST because there's a problem
 # with autotools and HFS+ MacOSX file systems that caused debian/Makefile.am
 # to pick up on the lowercase changelog file and add ChangeLog to DIST_COMMON

Modified: trunk/theora/configure.ac
===================================================================
--- trunk/theora/configure.ac	2007-07-10 18:37:36 UTC (rev 13241)
+++ trunk/theora/configure.ac	2007-07-10 18:49:18 UTC (rev 13242)
@@ -273,6 +273,14 @@
 fi
 AM_CONDITIONAL(THEORA_DISABLE_ENCODE, [test "x${ac_enable_encode}" != xyes])
 
+dnl Configuration option for examples
+
+ac_enable_examples=yes
+AC_ARG_ENABLE(examples,
+     [  --disable-examples      disable examples ],
+     [ ac_enable_examples=$enableval ], [ ac_enable_examples=yes] )
+AM_CONDITIONAL(THEORA_ENABLE_EXAMPLES, [test "x${ac_enable_examples}" != xno])
+
 dnl --------------------------------------------------
 dnl Check for headers
 dnl --------------------------------------------------
@@ -346,6 +354,7 @@
     Floating point support: ..... ${ac_enable_float}
     Assembly optimization: ...... ${cpu_optimization}
     API Documentation: .......... ${doc_build}
+    Build example code: ......... ${ac_enable_examples}
 
   Installation paths: