Commit 7ad41e7e authored by Gildas Bazin's avatar Gildas Bazin

* configure.ac: fixed libspeex > 1.1.0 detection.

* ALL: bumped version number to 0.7.2.
parent dc4cbfaa
dnl Autoconf settings for vlc dnl Autoconf settings for vlc
dnl $Id$ dnl $Id$
AC_INIT(vlc,0.7.2-test3) AC_INIT(vlc,0.7.2)
CONFIGURE_LINE="$0 $*" CONFIGURE_LINE="$0 $*"
CODENAME="Bond" CODENAME="Bond"
...@@ -13,7 +13,7 @@ AC_CANONICAL_SYSTEM ...@@ -13,7 +13,7 @@ AC_CANONICAL_SYSTEM
dnl XXX: we don't put any flags here, because automake 1.5 doesn't support 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. 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) AM_CONFIG_HEADER(config.h)
dnl dnl
...@@ -2306,8 +2306,19 @@ AC_ARG_ENABLE(speex, ...@@ -2306,8 +2306,19 @@ AC_ARG_ENABLE(speex,
if test "${enable_speex}" != "no" if test "${enable_speex}" != "no"
then then
AC_CHECK_HEADERS(speex.h, [ AC_CHECK_HEADERS(speex.h, [
AX_ADD_PLUGINS([speex]) AC_MSG_CHECKING(for libspeex version > 1.1.0)
AX_ADD_LDFLAGS([speex],[-lspeex]) ],[]) 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 fi
dnl dnl
......
/* Localized versions of Info.plist keys */ /* Localized versions of Info.plist keys */
CFBundleName = "VLC"; CFBundleName = "VLC";
CFBundleShortVersionString = "0.7.2-test3"; CFBundleShortVersionString = "0.7.2";
CFBundleGetInfoString = "VLC media player 0.7.2-test3, Copyright (c) 1996-2004 VideoLAN."; CFBundleGetInfoString = "VLC media player 0.7.2, Copyright (c) 1996-2004 VideoLAN.";
NSHumanReadableCopyright = "Copyright (c) 1996-2004 VideoLAN."; NSHumanReadableCopyright = "Copyright (c) 1996-2004 VideoLAN.";
...@@ -545,7 +545,7 @@ ...@@ -545,7 +545,7 @@
<key>CFBundleExecutable</key> <key>CFBundleExecutable</key>
<string>VLC</string> <string>VLC</string>
<key>CFBundleGetInfoString</key> <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> <key>CFBundleIconFile</key>
<string>vlc.icns</string> <string>vlc.icns</string>
<key>CFBundleIdentifier</key> <key>CFBundleIdentifier</key>
...@@ -557,7 +557,7 @@ ...@@ -557,7 +557,7 @@
<key>CFBundlePackageType</key> <key>CFBundlePackageType</key>
<string>APPL</string> <string>APPL</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
<string>0.7.2-test3</string> <string>0.7.2</string>
<key>CFBundleSignature</key> <key>CFBundleSignature</key>
<string>VLC#</string> <string>VLC#</string>
<key>CFBundleURLTypes</key> <key>CFBundleURLTypes</key>
...@@ -604,7 +604,7 @@ ...@@ -604,7 +604,7 @@
</dict> </dict>
</array> </array>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
<string>0.7.2-test3</string> <string>0.7.2</string>
<key>NSAppleScriptEnabled</key> <key>NSAppleScriptEnabled</key>
<string>YES</string> <string>YES</string>
<key>NSMainNibFile</key> <key>NSMainNibFile</key>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment