[xiph-commits] r17018 - in trunk/vorbis: . test

[xiphmont at svn.xiph.org]

Author: xiphmont
Date: 2010-03-24 02:08:33 -0700 (Wed, 24 Mar 2010)
New Revision: 17018

Modified:
   trunk/vorbis/Makefile.am
   trunk/vorbis/configure.ac
   trunk/vorbis/test/Makefile.am
Log:
Add patch to disable building examples by default, test Makefile.am fix
Closes Trac #1571


Modified: trunk/vorbis/Makefile.am
===================================================================
--- trunk/vorbis/Makefile.am	2010-03-24 08:34:27 UTC (rev 17017)
+++ trunk/vorbis/Makefile.am	2010-03-24 09:08:33 UTC (rev 17018)
@@ -2,8 +2,12 @@
 
 AUTOMAKE_OPTIONS = 1.6 foreign dist-zip dist-bzip2
 
-SUBDIRS = m4 include vq lib examples test doc
+SUBDIRS = m4 include vq lib test doc
 
+if BUILD_EXAMPLES 
+SUBDIRS += examples 
+endif 
+
 m4datadir = $(datadir)/aclocal
 m4data_DATA = vorbis.m4
 

Modified: trunk/vorbis/configure.ac
===================================================================
--- trunk/vorbis/configure.ac	2010-03-24 08:34:27 UTC (rev 17017)
+++ trunk/vorbis/configure.ac	2010-03-24 09:08:33 UTC (rev 17018)
@@ -89,6 +89,11 @@
 
 AM_CONDITIONAL(BUILD_DOCS, [test "x$enable_docs" = xyes])
 
+AC_ARG_ENABLE(examples, 
+  AS_HELP_STRING([--enable-examples], [build the examples])) 
+ 	
+AM_CONDITIONAL(BUILD_EXAMPLES, [test "x$enable_examples" = xyes]) 
+
 dnl --------------------------------------------------
 dnl Set build flags based on environment
 dnl --------------------------------------------------

Modified: trunk/vorbis/test/Makefile.am
===================================================================
--- trunk/vorbis/test/Makefile.am	2010-03-24 08:34:27 UTC (rev 17017)
+++ trunk/vorbis/test/Makefile.am	2010-03-24 09:08:33 UTC (rev 17018)
@@ -4,9 +4,9 @@
 
 INCLUDES = -I$(top_srcdir)/include @OGG_CFLAGS@
 
-noinst_PROGRAMS = test
+check_PROGRAMS = test
 
-check: $(noinst_PROGRAMS)
+check: $(check_PROGRAMS)
 	./test$(EXEEXT)
 
 test_SOURCES = util.c util.h write_read.c write_read.h test.c