[vlc-commits] speex: fix pkg-config file generation

[Edward Wang]

vlc/vlc-2.1 | branch: master | Edward Wang <edward.c.wang at compdigitec.com> | Wed Oct 23 22:40:10 2013 -0400| [09b30779b30a72b882117f5a5dd12824bda8718e] | committer: Felix Paul Kühne

speex: fix pkg-config file generation

Avoid generating a blank 'Version' field by moving the declaration after AC_INIT

Signed-off-by: Rafaël Carré <funman at videolan.org>
(cherry picked from commit 9f39e323bdff8df0ae3e0b4001e043bfb696463a)
Signed-off-by: Felix Paul Kühne <fkuehne at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commit;h=09b30779b30a72b882117f5a5dd12824bda8718e
---

 contrib/src/speex/automake.patch |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/contrib/src/speex/automake.patch b/contrib/src/speex/automake.patch
index 59015e6..82b7656 100644
--- a/contrib/src/speex/automake.patch
+++ b/contrib/src/speex/automake.patch
@@ -1,6 +1,6 @@
 --- speex/configure.ac.orig	2013-10-16 12:58:06.707579608 +0200
 +++ speex/configure.ac	2013-10-16 12:58:21.423579879 +0200
-@@ -1,9 +1,5 @@
+@@ -1,32 +1,29 @@
  dnl Process this file with autoconf to produce a configure script. -*-m4-*-
  
 -AC_INIT(libspeex/speex.c)
@@ -10,11 +10,11 @@
  SPEEX_MAJOR_VERSION=1
  SPEEX_MINOR_VERSION=1
  SPEEX_MICRO_VERSION=16
-@@ -11,22 +7,23 @@
+ SPEEX_EXTRA_VERSION=
  #SPEEX_VERSION=
  #SPEEX_VERSION=$SPEEX_MAJOR_VERSION.$SPEEX_MINOR_VERSION.$SPEEX_MICRO_VERSION$SPEEX_EXTRA_VERSION
- SPEEX_VERSION="1.2rc1"
 +AC_INIT([speex], 1.2rc1)
+ SPEEX_VERSION="1.2rc1"
  
  SPEEX_LT_CURRENT=6
  SPEEX_LT_REVISION=0