[xiph-commits] r18170 - icecast/trunk/libshout

[giles at svn.xiph.org]

Author: giles
Date: 2012-02-01 15:59:25 -0800 (Wed, 01 Feb 2012)
New Revision: 18170

Removed:
   icecast/trunk/libshout/shout-config.in
Modified:
   icecast/trunk/libshout/Makefile.am
   icecast/trunk/libshout/configure.ac
Log:
Remove the shout-config fallback script. Use pkg-config or nothing.


Modified: icecast/trunk/libshout/Makefile.am
===================================================================
--- icecast/trunk/libshout/Makefile.am	2012-02-01 23:37:51 UTC (rev 18169)
+++ icecast/trunk/libshout/Makefile.am	2012-02-01 23:59:25 UTC (rev 18170)
@@ -5,12 +5,10 @@
 
 SUBDIRS = include src examples debian doc win32
 
-EXTRA_DIST = INSTALL m4/shout.m4 m4/ac_config_libconfig_in.m4 m4/acx_pthread.m4 \
+EXTRA_DIST = INSTALL m4/shout.m4 m4/acx_pthread.m4 \
 	m4/ogg.m4 m4/vorbis.m4 m4/xiph_compiler.m4 m4/xiph_net.m4 \
 	m4/xiph_types.m4
 
-DISTCLEANFILES = shout-config.in
-
 docdir = $(datadir)/doc/$(PACKAGE)
 doc_DATA = COPYING NEWS README examples/example.c examples/nonblocking.c
 
@@ -20,8 +18,6 @@
 if HAVE_PKGCONFIG
   pkgconfigdir = $(libdir)/pkgconfig
   pkgconfig_DATA = shout.pc
-else
-  bin_SCRIPTS = shout-config
 endif
 
 debug:

Modified: icecast/trunk/libshout/configure.ac
===================================================================
--- icecast/trunk/libshout/configure.ac	2012-02-01 23:37:51 UTC (rev 18169)
+++ icecast/trunk/libshout/configure.ac	2012-02-01 23:59:25 UTC (rev 18170)
@@ -159,9 +159,7 @@
   AC_DEFINE([HAVE_SPEEX], 1, [Define if you want speex streams supported])
 fi
 
-dnl pkgconfig/shout-config.
-dnl If pkgconfig is found, use it and disable shout-config, otherwise do the
-dnl opposite, unless the user overrides.
+dnl If pkgconfig is found, install a shout.pc file.
 
 AC_ARG_ENABLE([pkgconfig],
   AC_HELP_STRING([--disable-pkgconfig],[disable pkgconfig data files (auto)]),
@@ -176,7 +174,7 @@
 fi
 AM_CONDITIONAL([HAVE_PKGCONFIG], [test "$PKGCONFIG" != "no"])
 
-# Build shout-config, shout.pc
+# Collect flags for shout.pc
 
 # I hate myself for doing this.
 save_prefix="$prefix"
@@ -200,8 +198,6 @@
 AC_SUBST(SHOUT_REQUIRES)
 AC_SUBST(SHOUT_CPPFLAGS)
 AC_SUBST(SHOUT_CFLAGS)
-AC_CONFIG_LIBCONFIG_IN_STATIC
-AC_CONFIG_LIBCONFIG_IN([shout])
 
 dnl Make substitutions
 
@@ -217,4 +213,4 @@
 AC_OUTPUT([Makefile debian/Makefile include/Makefile include/shout/Makefile
   include/shout/shout.h src/Makefile src/net/Makefile src/timing/Makefile
   src/thread/Makefile src/avl/Makefile src/httpp/Makefile doc/Makefile
-  examples/Makefile win32/Makefile shout-config shout.pc])
+  examples/Makefile win32/Makefile shout.pc])

Deleted: icecast/trunk/libshout/shout-config.in
===================================================================
--- icecast/trunk/libshout/shout-config.in	2012-02-01 23:37:51 UTC (rev 18169)
+++ icecast/trunk/libshout/shout-config.in	2012-02-01 23:59:25 UTC (rev 18170)
@@ -1 +0,0 @@
-This file will get overwritten by configure. It is here to make automake happy.