[xiph-cvs] cvs commit: libshout Makefile.am configure.in

[Brendan]

brendan     03/06/03 21:18:08

  Modified:    .        Makefile.am configure.in
  Log:
  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

Revision  Changes    Path
1.9       +6 -3      libshout/Makefile.am

Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/libshout/Makefile.am,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -u -r1.8 -r1.9
--- Makefile.am	3 Jun 2003 20:16:21 -0000	1.8
+++ Makefile.am	4 Jun 2003 01:18:08 -0000	1.9
@@ -7,10 +7,13 @@ SUBDIRS = include src examples
 
 EXTRA_DIST = README COPYING m4/ac_config_libconfig_in.m4 m4/acx_pthread.m4 \
         m4/ogg.m4 m4/vorbis.m4
-bin_SCRIPTS = shout-config
 
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = shout.pc
+if HAVE_PKGCONFIG
+  pkgconfigdir = $(libdir)/pkgconfig
+  pkgconfig_DATA = shout.pc
+else
+  bin_SCRIPTS = shout-config
+endif
 
 ##install-data-local:
         ##mkdir -p $(DESTDIR)$(includedir)/shout

<p><p>1.37      +6 -1      libshout/configure.in

Index: configure.in
===================================================================
RCS file: /usr/local/cvsroot/libshout/configure.in,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -u -r1.36 -r1.37
--- configure.in	3 Jun 2003 20:16:21 -0000	1.36
+++ configure.in	4 Jun 2003 01:18:08 -0000	1.37
@@ -1,5 +1,5 @@
 # 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_minor, 0)
@@ -139,6 +139,11 @@ fi
 XIPH_PATH_OGG
 XIPH_PATH_VORBIS
 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
 SHOUT_VERSION="$VERSION"

<p><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.