* configure.ac.in : Disabled GTK2 and gnome2 plug-in since they break

  all platforms but GNU/Linux
* Bumped up revision number to 0.5.3-test1

diff --git a/configure.ac.in b/configure.ac.in
index 35b2cdac2e8e7859729c98f2cd804fc567718a4a..80f257d0be3c2d72edaf29ec40bacc2ea95bf441 100644 (file)
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -1,6 +1,6 @@
 dnl Autoconf settings for vlc
 
-AC_INIT(vlc,0.5.3-cvs)
+AC_INIT(vlc,0.5.3-test1)
 
 CONFIGURE_LINE="$0 $*"
 CODENAME="Natalya"
@@ -12,7 +12,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.5.3-cvs)
+AM_INIT_AUTOMAKE(vlc,0.5.3-test1)
 AM_CONFIG_HEADER(config.h)
 
 dnl
@@ -2313,7 +2313,7 @@ AC_ARG_ENABLE(gtk2,
   [  --enable-gtk2           Gtk2 support (default disabled)])
 if test "x${enable_gtk2}" = "xyes"
 then
-  PKG_CHECK_MODULES(GTK2, [gtk+-2.0 >= 2.0.0, gthread-2.0])
+  #PKG_CHECK_MODULES(GTK2, [gtk+-2.0 >= 2.0.0, gthread-2.0])
   CFLAGS_gtk2="${CFLAGS_gtk2} ${GTK2_CFLAGS}"
   LDFLAGS_gtk2="${LDFLAGS_gtk2} ${GTK2_LIBS}"
   PLUGINS="${PLUGINS} gtk2"
@@ -2445,7 +2445,7 @@ AC_ARG_ENABLE(gnome2,
   [  --enable-gnome2         Gnome2 support (default disabled)])
 if test "x${enable_gnome2}" = "xyes"
 then
-  PKG_CHECK_MODULES(GNOME2, [libgnomeui-2.0])
+  #PKG_CHECK_MODULES(GNOME2, [libgnomeui-2.0])
   CFLAGS_gnome2="${CFLAGS_gnome2} ${GNOME2_CFLAGS}"
   LDFLAGS_gnome2="${LDFLAGS_gnome2} ${GNOME2_LIBS}"
   PLUGINS="${PLUGINS} gnome2"

diff --git a/extras/MacOSX/vlc.pbproj/project.pbxproj b/extras/MacOSX/vlc.pbproj/project.pbxproj
index baa4fa9179192e2ce42cbf1639e01359d80a03c6..bad34c8e4376750a45241a8c04451d5af1ecf3d2 100644 (file)
--- a/extras/MacOSX/vlc.pbproj/project.pbxproj
+++ b/extras/MacOSX/vlc.pbproj/project.pbxproj
@@ -356,7 +356,7 @@
        <key>CFBundleExecutable</key>
        <string>VLC</string>
        <key>CFBundleGetInfoString</key>
-       <string>VLC media player 0.5.3-cvs, Copyright (c) 1996-2003 VideoLAN.</string>
+       <string>VLC media player 0.5.3-test1, Copyright (c) 1996-2003 VideoLAN.</string>
        <key>CFBundleIconFile</key>
        <string>vlc.icns</string>
        <key>CFBundleIdentifier</key>
@@ -368,7 +368,7 @@
        <key>CFBundlePackageType</key>
        <string>APPL</string>
        <key>CFBundleShortVersionString</key>
-       <string>0.5.3-cvs</string>
+       <string>0.5.3-test1</string>
        <key>CFBundleSignature</key>
        <string>VLC#</string>
        <key>CFBundleURLTypes</key>
@@ -415,7 +415,7 @@
                </dict>
        </array>
        <key>CFBundleVersion</key>
-       <string>0.5.3-cvs</string>
+       <string>0.5.3-test1</string>
        <key>NSAppleScriptEnabled</key>
        <string>YES</string>
        <key>NSMainNibFile</key>