* configure.ac: fixed libspeex > 1.1.0 detection.

* ALL: bumped version number to 0.7.2.

diff --git a/configure.ac b/configure.ac
index add1de23881235650c34525271195117baace37c..db2b63bf55e3b784a0ae82ef32061a9a645e9477 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 dnl Autoconf settings for vlc
 dnl $Id$
  
-AC_INIT(vlc,0.7.2-test3)
+AC_INIT(vlc,0.7.2)
 
 CONFIGURE_LINE="$0 $*"
 CODENAME="Bond"
@@ -13,7 +13,7 @@ AC_CANONICAL_SYSTEM
 
 dnl XXX: we don't put any flags here, because automake 1.5 doesn't support
 dnl them. And we need the comma otherwize automake will choke on it.
-AM_INIT_AUTOMAKE(vlc,0.7.2-test3)
+AM_INIT_AUTOMAKE(vlc,0.7.2)
 AM_CONFIG_HEADER(config.h)
 
 dnl
@@ -2306,8 +2306,19 @@ AC_ARG_ENABLE(speex,
 if test "${enable_speex}" != "no"
 then
   AC_CHECK_HEADERS(speex.h, [
-    AX_ADD_PLUGINS([speex])
-    AX_ADD_LDFLAGS([speex],[-lspeex]) ],[])
+    AC_MSG_CHECKING(for libspeex version > 1.1.0)
+    AC_EGREP_CPP(yes,
+      [#include <speex.h>
+       #ifdef SPEEX_SET_SUBMODE_ENCODING
+       yes
+       #endif],
+      [ AC_MSG_RESULT([yes])
+        AX_ADD_PLUGINS([speex])
+        AX_ADD_LDFLAGS([speex],[-lspeex]) ],
+      [ AC_MSG_RESULT([no])
+        AC_MSG_WARN([Your libspeex is too old, please get the development
+                     version.]) ] )
+    ],[])
 fi
 
 dnl

diff --git a/extras/MacOSX/Resources/English.lproj/InfoPlist.strings b/extras/MacOSX/Resources/English.lproj/InfoPlist.strings
index 3599354901cc7b64c8519b35484d40ae2df8d6f9..048a99b0a7ec00818fd70007163f5cddb707d827 100644 (file)
--- a/extras/MacOSX/Resources/English.lproj/InfoPlist.strings
+++ b/extras/MacOSX/Resources/English.lproj/InfoPlist.strings
@@ -1,6 +1,6 @@
 /* Localized versions of Info.plist keys */
 
 CFBundleName = "VLC";
-CFBundleShortVersionString = "0.7.2-test3";
-CFBundleGetInfoString = "VLC media player 0.7.2-test3, Copyright (c) 1996-2004 VideoLAN.";
+CFBundleShortVersionString = "0.7.2";
+CFBundleGetInfoString = "VLC media player 0.7.2, Copyright (c) 1996-2004 VideoLAN.";
 NSHumanReadableCopyright = "Copyright (c) 1996-2004 VideoLAN.";

diff --git a/extras/MacOSX/vlc.pbproj/project.pbxproj b/extras/MacOSX/vlc.pbproj/project.pbxproj
index 0443c31b915ff94ceb1286f5a8279f90156a4c09..33b427f6e5390f8daf580daafa2c9252cce344f0 100644 (file)
--- a/extras/MacOSX/vlc.pbproj/project.pbxproj
+++ b/extras/MacOSX/vlc.pbproj/project.pbxproj
@@ -545,7 +545,7 @@
        <key>CFBundleExecutable</key>
        <string>VLC</string>
        <key>CFBundleGetInfoString</key>
-       <string>VLC media player 0.7.2-test3, Copyright (c) 1996-2003 VideoLAN.</string>
+       <string>VLC media player 0.7.2, Copyright (c) 1996-2003 VideoLAN.</string>
        <key>CFBundleIconFile</key>
        <string>vlc.icns</string>
        <key>CFBundleIdentifier</key>
@@ -557,7 +557,7 @@
        <key>CFBundlePackageType</key>
        <string>APPL</string>
        <key>CFBundleShortVersionString</key>
-       <string>0.7.2-test3</string>
+       <string>0.7.2</string>
        <key>CFBundleSignature</key>
        <string>VLC#</string>
        <key>CFBundleURLTypes</key>
@@ -604,7 +604,7 @@
                </dict>
        </array>
        <key>CFBundleVersion</key>
-       <string>0.7.2-test3</string>
+       <string>0.7.2</string>
        <key>NSAppleScriptEnabled</key>
        <string>YES</string>
        <key>NSMainNibFile</key>