[xiph-commits] r12570 - in trunk/ezstream: . m4

[moritz at svn.xiph.org]

Author: moritz
Date: 2007-02-26 07:28:50 -0800 (Mon, 26 Feb 2007)
New Revision: 12570

Modified:
   trunk/ezstream/Makefile.am
   trunk/ezstream/m4/ogg.m4
   trunk/ezstream/m4/vorbis.m4
Log:
Unbreak "make distcheck": $prefix is not a good default, use /usr/local instead.
This makes it more likely that installed libogg and libvorbis are found, when
the user (or autoconf) specifies a different --prefix. Users who installed
their libraries in their homedir now have to set $OGG_PREFIX and $VORBIS_PREFIX,
or set their respective --with arguments.
Let the snapshot target use distcheck now that it works.


Modified: trunk/ezstream/Makefile.am
===================================================================
--- trunk/ezstream/Makefile.am	2007-02-26 11:00:58 UTC (rev 12569)
+++ trunk/ezstream/Makefile.am	2007-02-26 15:28:50 UTC (rev 12570)
@@ -10,4 +10,4 @@
 .PHONY:		snapshot
 
 snapshot:
-	${MAKE} dist distdir=${PACKAGE}-snapshot-`date +'%Y%m%d'`
+	${MAKE} distcheck distdir=${PACKAGE}-snapshot-`date +'%Y%m%d'`

Modified: trunk/ezstream/m4/ogg.m4
===================================================================
--- trunk/ezstream/m4/ogg.m4	2007-02-26 11:00:58 UTC (rev 12569)
+++ trunk/ezstream/m4/ogg.m4	2007-02-26 15:28:50 UTC (rev 12570)
@@ -7,15 +7,19 @@
 dnl Test for libogg, and define OGG_CFLAGS OGG_LDFLAGS and OGG_LIBS
 dnl
 AC_DEFUN([XIPH_PATH_OGG],
-[dnl 
-AC_ARG_VAR([OGG_PREFIX],[path to ogg installation])
+[dnl
+AC_ARG_VAR([OGG_PREFIX],[path to Ogg installation])
 AC_ARG_WITH(ogg,
-    [AC_HELP_STRING([--with-ogg=PREFIX],
+    [AS_HELP_STRING([--with-ogg=PREFIX],
         [Prefix where libogg is installed (optional)])],
-    ogg_prefix="$withval",
-    ogg_prefix="$OGG_PREFIX"
-    )
-if test "x$ogg_prefix" = "x" -o "x$ogg_prefix" = "xyes"; then
+    [ogg_prefix="$withval"], [
+    if test x"$OGG_PREFIX" != "x"; then
+        ogg_prefix="$OGG_PREFIX"
+    else
+        ogg_prefix=/usr/local
+    fi
+    ])
+if test "x$ogg_prefix" = "xyes"; then
     if test "x$prefix" = "xNONE"; then
         ogg_prefix=/usr/local
     else

Modified: trunk/ezstream/m4/vorbis.m4
===================================================================
--- trunk/ezstream/m4/vorbis.m4	2007-02-26 11:00:58 UTC (rev 12569)
+++ trunk/ezstream/m4/vorbis.m4	2007-02-26 15:28:50 UTC (rev 12570)
@@ -14,14 +14,18 @@
 
 dnl Get the cflags and libraries for vorbis
 dnl
-AC_ARG_VAR([VORBIS_PREFIX],[path to vorbis installation])
+AC_ARG_VAR([VORBIS_PREFIX],[path to Vorbis installation])
 AC_ARG_WITH(vorbis,
-    AC_HELP_STRING([--with-vorbis=PREFIX],
+    AS_HELP_STRING([--with-vorbis=PREFIX],
         [Prefix where libvorbis is installed (optional)]),
-    vorbis_prefix="$withval",
-    vorbis_prefix="$VORBIS_PREFIX"
-    )
-if test "x$vorbis_prefix" = "x" -o "x$vorbis_prefix" = "xyes"; then
+    [vorbis_prefix="$withval"], [
+    if test x"$VORBIS_PREFIX" != "x"; then
+        vorbis_prefix="$VORBIS_PREFIX"
+    else
+        vorbis_prefix=/usr/local
+    fi
+    ])
+if test "x$vorbis_prefix" = "xyes"; then
     if test "x$prefix" = "xNONE"; then
         vorbis_prefix="/usr/local"
     else