Commit 441c6f87 authored by brendan's avatar brendan
Browse files

Suppress shout-config installation if pkg-config is found on build system.

And, vice versa.

TODO:
1. create AC macro that searches pkg-config and shout-config for shout flags.
2. make suppression/generation of *-config user-configurable

svn path=/trunk/libshout/; revision=4869
parent 66fa8c24
...@@ -7,10 +7,13 @@ SUBDIRS = include src examples ...@@ -7,10 +7,13 @@ SUBDIRS = include src examples
EXTRA_DIST = README COPYING m4/ac_config_libconfig_in.m4 m4/acx_pthread.m4 \ EXTRA_DIST = README COPYING m4/ac_config_libconfig_in.m4 m4/acx_pthread.m4 \
m4/ogg.m4 m4/vorbis.m4 m4/ogg.m4 m4/vorbis.m4
bin_SCRIPTS = shout-config
pkgconfigdir = $(libdir)/pkgconfig if HAVE_PKGCONFIG
pkgconfig_DATA = shout.pc pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = shout.pc
else
bin_SCRIPTS = shout-config
endif
##install-data-local: ##install-data-local:
##mkdir -p $(DESTDIR)$(includedir)/shout ##mkdir -p $(DESTDIR)$(includedir)/shout
......
# Process this file with autoconf to produce a configure script. # Process this file with autoconf to produce a configure script.
# $Id: configure.in,v 1.36 2003/06/03 20:16:21 brendan Exp $ # $Id: configure.in,v 1.37 2003/06/04 01:18:08 brendan Exp $
m4_define(libshout_major, 2) m4_define(libshout_major, 2)
m4_define(libshout_minor, 0) m4_define(libshout_minor, 0)
...@@ -140,6 +140,11 @@ XIPH_PATH_OGG ...@@ -140,6 +140,11 @@ XIPH_PATH_OGG
XIPH_PATH_VORBIS XIPH_PATH_VORBIS
XIPH_CFLAGS="$XIPH_CFLAGS $VORBIS_CFLAGS $OGG_CFLAGS" XIPH_CFLAGS="$XIPH_CFLAGS $VORBIS_CFLAGS $OGG_CFLAGS"
dnl pkgconfig/shout-config tests. If pkgconfig is found, use it and disable
dnl shout-config, otherwise do the opposite. TODO: make user-configurable
AC_CHECK_PROG([PKGCONFIG], [pkg-config], [yes], [no])
AM_CONDITIONAL([HAVE_PKGCONFIG], [test "$PKGCONFIG" != "no"])
# Build shout-config, shout.pc # Build shout-config, shout.pc
SHOUT_VERSION="$VERSION" SHOUT_VERSION="$VERSION"
SHOUT_LIBS="-lshout" SHOUT_LIBS="-lshout"
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment