[xiph-commits] r7486 - in icecast/branches/kh/icecast: . src

[karl at motherfish-iii.xiph.org]

Author: karl
Date: Thu Aug  5 19:52:31 2004
New Revision: 7486

Modified:
icecast/branches/kh/icecast/Makefile.am
icecast/branches/kh/icecast/configure.in
icecast/branches/kh/icecast/src/Makefile.am
Log:
fix a non-standard install path issue


Modified: icecast/branches/kh/icecast/Makefile.am
===================================================================
--- icecast/branches/kh/icecast/Makefile.am	2004-08-05 14:54:23 UTC (rev 7485)
+++ icecast/branches/kh/icecast/Makefile.am	2004-08-05 16:12:55 UTC (rev 7486)
@@ -5,7 +5,8 @@

SUBDIRS = src conf debian doc web admin win32

-EXTRA_DIST = HACKING m4/acx_pthread.m4 m4/ogg.m4 m4/vorbis.m4 \
+EXTRA_DIST = HACKING m4/acx_pthread.m4 m4/ogg.m4 \
+    m4/theora.m4 m4/vorbis.m4 \
m4/xiph_compiler.m4 m4/xiph_curl.m4 m4/xiph_net.m4 \
m4/xiph_types.m4 m4/xiph_xml2.m4 icecast.spec


Modified: icecast/branches/kh/icecast/configure.in
===================================================================
--- icecast/branches/kh/icecast/configure.in	2004-08-05 14:54:23 UTC (rev 7485)
+++ icecast/branches/kh/icecast/configure.in	2004-08-05 16:12:55 UTC (rev 7486)
@@ -77,14 +77,17 @@
XIPH_PATH_VORBIS(, AC_MSG_ERROR([must have Ogg Vorbis v1.0 installed!]))
XIPH_VAR_APPEND([XIPH_CPPFLAGS],[$VORBIS_CFLAGS])
XIPH_VAR_PREPEND([XIPH_LIBS],[$VORBIS_LIBS])
+XIPH_VAR_APPEND([XIPH_LDFLAGS],[$VORBIS_LDFLAGS])

-XIPH_PATH_THEORA(, AC_MSG_WARN([Theora support disabled!]))
+XIPH_PATH_THEORA(, AC_MSG_WARN([Theora not found disabled!]))
XIPH_VAR_APPEND([XIPH_CPPFLAGS],[$THEORA_CFLAGS])
XIPH_VAR_PREPEND([XIPH_LIBS],[$THEORA_LIBS])
+XIPH_VAR_APPEND([XIPH_LDFLAGS],[$THEORA_LDFLAGS])

XIPH_PATH_SPEEX(, AC_MSG_WARN([Speex support disabled!]))
XIPH_VAR_APPEND([XIPH_CPPFLAGS],[$SPEEX_CFLAGS])
XIPH_VAR_PREPEND([XIPH_LIBS],[$SPEEX_LIBS])
+XIPH_VAR_APPEND([XIPH_LDFLAGS],[$SPEEX_LDFLAGS])

ACX_PTHREAD(, AC_MSG_ERROR([POSIX threads missing]))
XIPH_VAR_APPEND([XIPH_CFLAGS],[$PTHREAD_CFLAGS])
@@ -142,6 +145,7 @@
AC_SUBST(XIPH_CPPFLAGS)
AC_SUBST(XIPH_CFLAGS)
AC_SUBST(XIPH_LIBS)
+AC_SUBST(XIPH_LDFLAGS)
AC_SUBST(PTHREAD_CPPFLAGS)
AC_SUBST(PTHREAD_CFLAGS)
AC_SUBST(PTHREAD_LIBS)

Modified: icecast/branches/kh/icecast/src/Makefile.am
===================================================================
--- icecast/branches/kh/icecast/src/Makefile.am	2004-08-05 14:54:23 UTC (rev 7485)
+++ icecast/branches/kh/icecast/src/Makefile.am	2004-08-05 16:12:55 UTC (rev 7486)
@@ -21,6 +21,7 @@

AM_CFLAGS = @XIPH_CFLAGS@
AM_CPPFLAGS = @XIPH_CPPFLAGS@
+AM_LDFLAGS = @XIPH_LDFLAGS@


debug: