[FFmpeg-devel] [PATCH]Allow libspeex detection also without pkg-config

[Carl Eugen Hoyos]

Hi!

Attached patch fixes ticket #4197 for me.

Please merge, Carl Eugen
-------------- next part --------------
From 56ce16fd3f10c4259df7abbbcc1f9681f055564b Mon Sep 17 00:00:00 2001
From: Carl Eugen Hoyos <cehoyos at ag.or.at>
Date: Wed, 31 Dec 2014 13:20:58 +0100
Subject: [PATCH] configure: Allow libspeex detection with and without
 pkg-config.

Fixes ticket #4197.
---
 configure |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/configure b/configure
index 9085200..95096e7 100755
--- a/configure
+++ b/configure
@@ -4899,7 +4899,11 @@ enabled libsmbclient      && { use_pkg_config smbclient libsmbclient.h smbc_init
                                require smbclient libsmbclient.h smbc_init -lsmbclient; }
 enabled libsoxr           && require libsoxr soxr.h soxr_create -lsoxr
 enabled libssh            && require_pkg_config libssh libssh/sftp.h sftp_init
-enabled libspeex          && require_pkg_config speex speex/speex.h speex_decoder_init -lspeex
+enabled libspeex          && { use_pkg_config speex speex/speex.h speex_decoder_init -lspeex ||
+                             { require libspeex speex/speex.h speex_decoder_init -lspeex &&
+                               warn "using libspeex without pkg-config"; } } ||
+                             die "ERROR: libspeex not found";
+
 enabled libstagefright_h264 && require_cpp libstagefright_h264 "binder/ProcessState.h media/stagefright/MetaData.h
     media/stagefright/MediaBufferGroup.h media/stagefright/MediaDebug.h media/stagefright/MediaDefs.h
     media/stagefright/OMXClient.h media/stagefright/OMXCodec.h" android::OMXClient -lstagefright -lmedia -lutils -lbinder -lgnustl_static
-- 
1.7.10.4