[xiph-commits] r3506 - in liboggz/trunk: . apache

[conrad at svn.annodex.net]

Author: conrad
Date: 2008-02-29 00:37:39 -0800 (Fri, 29 Feb 2008)
New Revision: 3506

Added:
   liboggz/trunk/apache/oggz-chop.conf.in
Removed:
   liboggz/trunk/apache/oggz-chop.conf
Modified:
   liboggz/trunk/configure.ac
Log:
generate example oggz-chop apache config, using configured BINDIR


Deleted: liboggz/trunk/apache/oggz-chop.conf
===================================================================
--- liboggz/trunk/apache/oggz-chop.conf	2008-02-29 07:39:12 UTC (rev 3505)
+++ liboggz/trunk/apache/oggz-chop.conf	2008-02-29 08:37:39 UTC (rev 3506)
@@ -1,4 +0,0 @@
-<IfModule mod_actions.c>
-  ScriptAlias /oggz-chop /usr/local/bin/oggz-chop
-  Action application/ogg /oggz-chop
-</IfModule>

Added: liboggz/trunk/apache/oggz-chop.conf.in
===================================================================
--- liboggz/trunk/apache/oggz-chop.conf.in	                        (rev 0)
+++ liboggz/trunk/apache/oggz-chop.conf.in	2008-02-29 08:37:39 UTC (rev 3506)
@@ -0,0 +1,4 @@
+<IfModule mod_actions.c>
+  ScriptAlias /oggz-chop @BINDIR@/oggz-chop
+  Action application/ogg /oggz-chop
+</IfModule>

Modified: liboggz/trunk/configure.ac
===================================================================
--- liboggz/trunk/configure.ac	2008-02-29 07:39:12 UTC (rev 3505)
+++ liboggz/trunk/configure.ac	2008-02-29 08:37:39 UTC (rev 3506)
@@ -398,6 +398,13 @@
 
 else
 
+AS_AC_EXPAND(LIBDIR, ${libdir})
+AS_AC_EXPAND(INCLUDEDIR, ${includedir})
+AS_AC_EXPAND(BINDIR, ${bindir})
+AS_AC_EXPAND(DOCDIR, ${datadir}/doc)
+
+AC_SUBST(BINDIR)
+
 AC_SUBST(SHLIB_VERSION_ARG)
 AC_SUBST(SHARED_VERSION_INFO)
 
@@ -416,15 +423,11 @@
 src/tools/oggz-chop/Makefile
 src/tests/Makefile
 src/examples/Makefile
+apache/oggz-chop.conf
 oggz.pc
 oggz-uninstalled.pc
 ])
 
-AS_AC_EXPAND(LIBDIR, ${libdir})
-AS_AC_EXPAND(INCLUDEDIR, ${includedir})
-AS_AC_EXPAND(BINDIR, ${bindir})
-AS_AC_EXPAND(DOCDIR, ${datadir}/doc)
-
 AC_MSG_RESULT([
 ------------------------------------------------------------------------
   $PACKAGE $VERSION:  Automatic configuration OK.