aniani/icecast-server
1
0
Fork 0
mirror of https://gitlab.xiph.org/xiph/icecast-server.git synced 2024-12-04 14:46:30 -05:00
Code

Don't use PKG_CHECK_MODULES: it aborts configure on systems without pkg-config,

Browse Source 
even if action-if-not-found is defined.

Rename have_shout to xt_have_shout, in conformance with macro writing guidelines :)

svn path=/trunk/m4/; revision=5006
This commit is contained in:
brendan 2003-06-25 17:03:55 +00:00
parent 4dacf00422
commit 1726d0cd89
1 changed files with 28 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
m4/shout.m4
View File

@ -3,44 +3,43 @@ dnl Jack Moffitt <jack@icecast.org> 08-06-2001
dnl Rewritten for libshout 2 dnl Rewritten for libshout 2
dnl Brendan Cully <brendan@xiph.org> 20030612 dnl Brendan Cully <brendan@xiph.org> 20030612
dnl dnl
dnl $Id: shout.m4,v 1.8 2003/06/25 17:03:55 brendan Exp $
# XIPH_PATH_SHOUT([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]) # XIPH_PATH_SHOUT([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
# Test for libshout, and define SHOUT_CFLAGS and SHOUT_LIBS # Test for libshout, and define SHOUT_CFLAGS and SHOUT_LIBS
AC_DEFUN([XIPH_PATH_SHOUT], AC_DEFUN([XIPH_PATH_SHOUT],
[dnl [dnl
have_shout="no" xt_have_shout="no"
SHOUT_CFLAGS="" SHOUT_CFLAGS=""
SHOUT_LIBS="" SHOUT_LIBS=""
# NB: PKG_CHECK_MODULES exits if pkg-config is unavailable on the targe
# system, so we can't use it.
# Step 1: Use pkg-config if available # Step 1: Use pkg-config if available
m4_ifdef([PKG_CHECK_MODULES], AC_PATH_PROG([PKGCONFIG], [pkg-config], [no])
[# PKG_CHECK_MODULES available if test "$PKGCONFIG" != "no" && `$PKGCONFIG --exists shout`
PKG_CHECK_MODULES([SHOUT], [shout])
have_shout="maybe"],
[# PKG_CHECK_MODULES is unavailable, search for pkg-config program
AC_PATH_PROG([PKGCONFIG], [pkg-config], [none])
if test "$PKGCONFIG" != "none" && `$PKGCONFIG --exists shout`
then then
SHOUT_CFLAGS=`$PKGCONFIG --cflags shout` SHOUT_CFLAGS=`$PKGCONFIG --cflags shout`
SHOUT_LIBS=`$PKGCONFIG --libs shout` SHOUT_LIBS=`$PKGCONFIG --libs shout`
have_shout="maybe" xt_have_shout="maybe"
else else
if test "$PKGCONFIG" != "none" if test "$PKGCONFIG" != "no"
then then
AC_MSG_NOTICE([$PKGCONFIG couldn't find libshout. Try adjusting PKG_CONFIG_PATH.]) AC_MSG_NOTICE([$PKGCONFIG couldn't find libshout. Try adjusting PKG_CONFIG_PATH.])
fi fi
# Step 2: try shout-config # pkg-config unavailable, try shout-config
AC_PATH_PROG([SHOUTCONFIG], [shout-config], [none]) AC_PATH_PROG([SHOUTCONFIG], [shout-config], [no])
if test "$SHOUTCONFIG" != "none" && test `$SHOUTCONFIG --package` = "libshout" if test "$SHOUTCONFIG" != "no" && test `$SHOUTCONFIG --package` = "libshout"
then then
SHOUT_CFLAGS=`$SHOUTCONFIG --cflags` SHOUT_CFLAGS=`$SHOUTCONFIG --cflags`
SHOUT_LIBS=`$SHOUTCONFIG --libs` SHOUT_LIBS=`$SHOUTCONFIG --libs`
have_shout="maybe" xt_have_shout="maybe"
fi fi
fi fi
])
# Now try actually using libshout # Now try actually using libshout
if test "$have_shout" != "no" if test "$xt_have_shout" != "no"
then then
ac_save_CFLAGS="$CFLAGS" ac_save_CFLAGS="$CFLAGS"
ac_save_LIBS="$LIBS" ac_save_LIBS="$LIBS"
@ -50,14 +49,14 @@ then
AC_DEFINE([HAVE_SHOUT_SHOUT_H], 1, [Define if you have <shout/shout.h>]) AC_DEFINE([HAVE_SHOUT_SHOUT_H], 1, [Define if you have <shout/shout.h>])
AC_CHECK_FUNC([shout_new], [ AC_CHECK_FUNC([shout_new], [
ifelse([$1], , :, [$1]) ifelse([$1], , :, [$1])
have_shout="yes" xt_have_shout="yes"
]) ])
]) ])
CFLAGS="$ac_save_CFLAGS" CFLAGS="$ac_save_CFLAGS"
LIBS="$ac_save_LIBS" LIBS="$ac_save_LIBS"
fi fi
if test "$have_shout" != "yes" if test "$xt_have_shout" != "yes"
then then
ifelse([$2], , :, [$2]) ifelse([$2], , :, [$2])
fi fi