aniani/ezstream
1
0
Fork 0
mirror of https://gitlab.xiph.org/xiph/ezstream.git synced 2024-12-04 14:46:31 -05:00
Code

Unbreak "make distcheck": $prefix is not a good default, use /usr/local instead.

Browse Source 
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.


git-svn-id: https://svn.xiph.org/trunk/ezstream@12570 0101bb08-14d6-0310-b084-bc0e0c8e3800
This commit is contained in:
moritz 2007-02-26 15:28:50 +00:00
parent e05ccb9f05
commit 678e161e54
3 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@ -10,4 +10,4 @@ CLEANFILES = core *.core *~ .*~
.PHONY: snapshot
snapshot:
${MAKE} dist distdir=${PACKAGE}-snapshot-`date +'%Y%m%d'`
${MAKE} distcheck distdir=${PACKAGE}-snapshot-`date +'%Y%m%d'`

18
m4/ogg.m4
View File

@ -7,15 +7,19 @@ dnl XIPH_PATH_OGG([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
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

16
m4/vorbis.m4
View File

@ -14,14 +14,18 @@ AC_REQUIRE([XIPH_PATH_OGG])
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