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

[Brendan]

brendan     03/06/04 17:55:53

  Modified:    .        configure.in
  Log:
  Let the user override pkgconfig use with --enable-pkgconfig. Otherwise
  it will be used based on whether pkg-config is in the path.

Revision  Changes    Path
1.38      +16 -4     libshout/configure.in

Index: configure.in
===================================================================
RCS file: /usr/local/cvsroot/libshout/configure.in,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -u -r1.37 -r1.38
--- configure.in	4 Jun 2003 01:18:08 -0000	1.37
+++ configure.in	4 Jun 2003 21:55:53 -0000	1.38
@@ -1,5 +1,5 @@
 # Process this file with autoconf to produce a configure script.
-# $Id: configure.in,v 1.37 2003/06/04 01:18:08 brendan Exp $
+# $Id: configure.in,v 1.38 2003/06/04 21:55:53 brendan Exp $
 
 m4_define(libshout_major, 2)
 m4_define(libshout_minor, 0)
@@ -140,9 +140,21 @@ 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])
+dnl pkgconfig/shout-config.
+dnl If pkgconfig is found, use it and disable shout-config, otherwise do the
+dnl opposite, unless the user overrides.
+
+AC_ARG_ENABLE([pkgconfig],
+  [  --disable-pkgconfig     disable pkgconfig data files (auto)],
+  [dopkgconfig="$enableval"], [dopkgconfig="maybe"])
+if test "$dopkgconfig" == "maybe"
+then
+  AC_CHECK_PROG([PKGCONFIG], [pkg-config], [yes], [no])
+else
+  AC_MSG_CHECKING([whether pkgconfig should be used])
+  PKGCONFIG="$dopkgconfig"
+  AC_MSG_RESULT([$PKGCONFIG])
+fi
 AM_CONDITIONAL([HAVE_PKGCONFIG], [test "$PKGCONFIG" != "no"])
 
 # Build shout-config, shout.pc

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