brendan 03/06/03 16:16:21
Modified: . Makefile.am configure.in
Added: . shout.pc.in
Log:
Generate shout.pc (pkgconfig data file for libshout).
Still need:
1. detect whether pkg-config is installed, switch shout.pc on and shout-config
off if so.
2. make 1. optional
3. Create AC macro to use pkg-config if available, otherwise try shout-config,
otherwise try linking by hand (?), use it in ices.
Revision Changes Path
1.8 +3 -0 libshout/Makefile.am
Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/libshout/Makefile.am,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -u -r1.7 -r1.8
--- Makefile.am 11 Mar 2003 07:43:34 -0000 1.7
+++ Makefile.am 3 Jun 2003 20:16:21 -0000 1.8
@@ -9,6 +9,9 @@ EXTRA_DIST = README COPYING m4/ac_config
m4/ogg.m4 m4/vorbis.m4
bin_SCRIPTS = shout-config
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = shout.pc
+
##install-data-local:
##mkdir -p $(DESTDIR)$(includedir)/shout
##mkdir -p $(DESTDIR)$(prefix)/doc/$(PACKAGE)-$(VERSION)/example
<p><p>1.36 +7 -5 libshout/configure.in
Index: configure.in
===================================================================
RCS file: /usr/local/cvsroot/libshout/configure.in,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -u -r1.35 -r1.36
--- configure.in 26 Mar 2003 12:19:16 -0000 1.35
+++ configure.in 3 Jun 2003 20:16:21 -0000 1.36
@@ -1,5 +1,5 @@
# Process this file with autoconf to produce a configure script.
-# $Id: configure.in,v 1.35 2003/03/26 12:19:16 karl Exp $
+# $Id: configure.in,v 1.36 2003/06/03 20:16:21 brendan Exp $
m4_define(libshout_major, 2)
m4_define(libshout_minor, 0)
@@ -140,11 +140,13 @@ XIPH_PATH_OGG
XIPH_PATH_VORBIS
XIPH_CFLAGS="$XIPH_CFLAGS $VORBIS_CFLAGS $OGG_CFLAGS"
-# Build shout-config
+# Build shout-config, shout.pc
SHOUT_VERSION="$VERSION"
SHOUT_LIBS="-lshout"
SHOUT_LIBDEPS="$VORBIS_LIBS $OGG_LIBS $PTHREAD_LIBS"
SHOUT_CFLAGS="$VORBIS_CFLAGS $OGG_CFLAGS $PTHREAD_CFLAGS"
+AC_SUBST(SHOUT_LIBDEPS)
+AC_SUBST(SHOUT_CFLAGS)
AC_CONFIG_LIBCONFIG_IN_STATIC
AC_CONFIG_LIBCONFIG_IN([shout])
@@ -158,6 +160,6 @@ AC_SUBST(CFLAGS)
AC_SUBST(PROFILE)
AC_SUBST(XIPH_CFLAGS)
-AC_OUTPUT([Makefile include/Makefile include/shout/Makefile src/Makefile src/net/Makefile
- src/timing/Makefile src/thread/Makefile src/avl/Makefile src/httpp/Makefile examples/Makefile
- shout-config])
+AC_OUTPUT([Makefile include/Makefile include/shout/Makefile src/Makefile
+ src/net/Makefile src/timing/Makefile src/thread/Makefile src/avl/Makefile
+ src/httpp/Makefile examples/Makefile shout-config shout.pc])
<p><p>1.1 libshout/shout.pc.in
Index: shout.pc.in
===================================================================
# libshout pkg-config source file
prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@
Name: Shout
Description: Audio streaming library for icecast sources
Version: @VERSION@
Libs: -L${libdir} -lshout @SHOUT_LIBDEPS@
Cflags: -I${includedir} @SHOUT_CFLAGS@
<p>--- >8 ----
List archives: http://www.xiph.org/archives/
Ogg project homepage: http://www.xiph.org/ogg/
To unsubscribe from this list, send a message to 'cvs-request at xiph.org'
containing only the word 'unsubscribe' in the body. No subject is needed.
Unsubscribe messages sent to the list will be ignored/filtered.