| [fd5b1fe] | 1 | Submitted By: Ryan Oliver <ryan.oliver@pha.com.au>
|
|---|
| 2 | Date: 2005-07-24
|
|---|
| 3 | Initial Package Version: 1.1.2
|
|---|
| 4 | Upstream Status: Unknown
|
|---|
| 5 | Origin: Gentoo
|
|---|
| 6 | Description:
|
|---|
| 7 |
|
|---|
| 8 | --- configure.in.old 2005-06-12 06:42:52.000000000 +0000
|
|---|
| 9 | +++ configure.in 2005-06-12 08:36:15.000000000 +0000
|
|---|
| 10 | @@ -35,6 +35,7 @@
|
|---|
| 11 | AM_PROG_AS
|
|---|
| 12 | AC_PROG_CXX
|
|---|
| 13 | AC_PROG_MAKE_SET
|
|---|
| 14 | +AC_PATH_PROG(PKGCONFIG, pkg-config)
|
|---|
| 15 |
|
|---|
| 16 | AC_CHECK_TYPES(socklen_t, [], [])
|
|---|
| 17 |
|
|---|
| 18 | @@ -151,10 +152,36 @@
|
|---|
| 19 | fi
|
|---|
| 20 |
|
|---|
| 21 | dnl check for ogg library
|
|---|
| 22 | -XIPH_PATH_OGG(have_ogg=yes, AC_MSG_WARN([*** Ogg development enviroment not installed - Ogg support will not be built]))
|
|---|
| 23 | -AM_CONDITIONAL(FLaC__HAS_OGG, [test x$have_ogg = xyes])
|
|---|
| 24 | -if test x$have_ogg = xyes ; then
|
|---|
| 25 | -AC_DEFINE(FLAC__HAS_OGG)
|
|---|
| 26 | +AC_ARG_ENABLE([ogg],
|
|---|
| 27 | + AC_HELP_STRING([--disable-ogg], [Disable ogg support (default:test)]),
|
|---|
| 28 | + [want_ogg=$enableval ], [ want_ogg=yes ] )
|
|---|
| 29 | +
|
|---|
| 30 | +AM_CONDITIONAL(FLaC__HAS_OGG, test x$want_ogg = xyes)
|
|---|
| 31 | +
|
|---|
| 32 | +if test "x$want_ogg" = "xyes"; then
|
|---|
| 33 | + AC_CHECK_HEADER(ogg/ogg.h,
|
|---|
| 34 | + [ogg_ok=yes
|
|---|
| 35 | + OGG_CFLAGS="`$PKGCONFIG ogg --cflags`"
|
|---|
| 36 | + OGG_LIBS="`$PKGCONFIG ogg --libs`"
|
|---|
| 37 | + AC_SUBST(OGG_CFLAGS)
|
|---|
| 38 | + AC_SUBST(OGG_LIBS)
|
|---|
| 39 | + ], [ogg_ok=no
|
|---|
| 40 | + OGG_CFLAGS=""
|
|---|
| 41 | + OGG_LIBS=""
|
|---|
| 42 | + AC_SUBST(OGG_CFLAGS)
|
|---|
| 43 | + AC_SUBST(OGG_LIBS)
|
|---|
| 44 | + ])
|
|---|
| 45 | + if test "x$ogg_ok" = "xyes"; then
|
|---|
| 46 | + AC_DEFINE(FLAC__HAS_OGG)
|
|---|
| 47 | + else
|
|---|
| 48 | + AC_MSG_WARN(*** Ogg headers not found. Ogg support disabled.)
|
|---|
| 49 | + fi
|
|---|
| 50 | +else
|
|---|
| 51 | + AC_MSG_RESULT([checking for ogg support... disabled])
|
|---|
| 52 | + OGG_CFLAGS=""
|
|---|
| 53 | + OGG_LIBS=""
|
|---|
| 54 | + AC_SUBST(OGG_CFLAGS)
|
|---|
| 55 | + AC_SUBST(OGG_LIBS)
|
|---|
| 56 | fi
|
|---|
| 57 |
|
|---|
| 58 | AM_PATH_XMMS(0.9.5.1, , AC_MSG_WARN([*** XMMS >= 0.9.5.1 not installed - xmms support will not be built]))
|
|---|
