[Icecast-dev] Don't hate yourself anymore, brendan

[LRN]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

These patches to libshout and shout.m4 reduce the level of self-hatred
significantly.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (MingW32)
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/

iQEcBAEBAgAGBQJRX7anAAoJEOs4Jb6SI2Cw2VgH/RDFPJjXdds1Cq3c0QyVyWs4
JWhPw2SI4vNGHF6U2q/DJQeBtsyY5BiUGckdew8skR5q0qc3D7iqBG5kiSC+G3Aq
ElBiBmx0vDe13MdRfeAFkesPisPPLP3g6wsrHQxKSh0vm89PAQGwkXIPTeSAemw6
1zi3wPB9MH4rFNqjrRx8LgSlvS+bayrky1PJ5DAaLpfEBq3p6cOWJKLh3m8RlQqp
y5Tn7f2jqsKc9uXea2bd9PjMK3vGKEixilZZ+qvRDuijsV/Hdrb0U4pyv2mYMhbX
W9dcFc2JPm6OTJU4f7NqrB1yIs3LsR7fCbBvsiBsfF1n8udyFm5T08zrVOI4yjw=
=WrDt
-----END PGP SIGNATURE-----
-------------- next part --------------
Index: configure.ac
===================================================================
--- configure.ac	(revision 18912)
+++ configure.ac	(working copy)
@@ -175,28 +175,15 @@ fi
 AM_CONDITIONAL([HAVE_PKGCONFIG], [test "$PKGCONFIG" != "no"])
 
 # Collect flags for shout.pc
-
-# I hate myself for doing this.
-save_prefix="$prefix"
-if test "$prefix" = "NONE"
-then
-  prefix="$ac_default_prefix"
-fi
-eval shout_includedir="$includedir"
-prefix="$save_prefix"
-
 SHOUT_VERSION="$VERSION"
-SHOUT_CPPFLAGS="-I$shout_includedir $VORBIS_CFLAGS $PTHREAD_CPPFLAGS"
-SHOUT_CFLAGS="$PTHREAD_CFLAGS"
+SHOUT_CFLAGS="$VORBIS_CFLAGS $PTHREAD_CFLAGS"
 SHOUT_LIBS="-lshout"
 
-XIPH_CLEAN_CCFLAGS([$SHOUT_CPPFLAGS], [SHOUT_CPPFLAGS])
 XIPH_CLEAN_CCFLAGS([$SHOUT_CFLAGS], [SHOUT_CFLAGS])
 XIPH_CLEAN_CCFLAGS([$VORBIS_LIBS $THEORA_LIBS $SPEEX_LIBS $PTHREAD_LIBS $LIBS], [SHOUT_LIBDEPS])
 AC_SUBST(PTHREAD_CPPFLAGS)
 AC_SUBST(SHOUT_LIBDEPS)
 AC_SUBST(SHOUT_REQUIRES)
-AC_SUBST(SHOUT_CPPFLAGS)
 AC_SUBST(SHOUT_CFLAGS)
 
 dnl Make substitutions
Index: shout.pc.in
===================================================================
--- shout.pc.in	(revision 18912)
+++ shout.pc.in	(working copy)
@@ -4,8 +4,6 @@ prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
-cppflags=@SHOUT_CPPFLAGS@
-cflags_only=@SHOUT_CFLAGS@
 
 Name: Shout
 Description: Audio streaming library for icecast encoders
-------------- next part --------------
Index: shout.m4
===================================================================
--- shout.m4	(revision 18912)
+++ shout.m4	(working copy)
@@ -27,8 +27,8 @@ export PKG_CONFIG_PATH
 AC_PATH_PROG([PKGCONFIG], [pkg-config], [no])
 if test "$PKGCONFIG" != "no" && `$PKGCONFIG --exists shout`
 then
-  SHOUT_CFLAGS=`$PKGCONFIG --variable=cflags_only shout`
-  SHOUT_CPPFLAGS=`$PKGCONFIG --variable=cppflags shout`
+  SHOUT_CFLAGS=`$PKGCONFIG --cflags-only-other shout`
+  SHOUT_CPPFLAGS=`$PKGCONFIG --cflags-only-I shout`
   SHOUT_LIBS=`$PKGCONFIG --libs shout`
   xt_have_shout="maybe"
 else