X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=configure.ac;h=fe9cf1893f3392311c47a31c3e4cdd78a2da28a3;hb=3def7a126ba8568ee7dcc8f9d2f1ce01f2603935;hp=265317df3b0ed59f249850950252cb98b4c72192;hpb=74e8b02dc79b147aa7de80c2cc62c46d5a41fbaa;p=vlc

diff --git a/configure.ac b/configure.ac
index 265317df3b..fe9cf1893f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,10 +1,10 @@
 dnl Autoconf settings for vlc
 
-AC_INIT(vlc,0.9.0-svn)
+AC_INIT(vlc,0.9.0-git)
 VERSION_MAJOR="0"
 VERSION_MINOR="9"
 VERSION_REVISION="0"
-VERSION_EXTRA="svn"
+VERSION_EXTRA="git"
 
 CONFIGURE_LINE="`echo "$0 $ac_configure_args" | sed -e 's/\\\/\\\\\\\/g'`"
 CODENAME="Grishenko"
@@ -392,7 +392,7 @@ lt_cv_deplibs_check_method=pass_all
 dnl
 dnl Gettext stuff
 dnl
-AM_GNU_GETTEXT_VERSION(0.16.1)
+AM_GNU_GETTEXT_VERSION(0.17)
 AM_GNU_GETTEXT([external])
 VLC_ADD_LIBS([libvlc vlc], [${LTLIBINTL}])
 
@@ -1194,7 +1194,7 @@ dnl
 VLC_ADD_PLUGINS([dummy logger memcpy])
 VLC_ADD_PLUGINS([mpgv mpga m4v m4a h264 vc1 demux_cdg cdg ps pva avi asf mp4 rawdv rawvid nsv real aiff mjpeg demuxdump flacsys tta])
 VLC_ADD_PLUGINS([cvdsub svcdsub spudec subsdec subsusf t140 dvbsub cc mpeg_audio lpcm a52 dts cinepak flac])
-VLC_ADD_PLUGINS([deinterlace invert adjust transform wave ripple psychedelic gradient motionblur rv32 rotate noise grain extract sharpen seamcarving])
+VLC_ADD_PLUGINS([deinterlace invert adjust transform wave ripple psychedelic gradient motionblur rv32 rotate noise grain extract sharpen seamcarving croppadd])
 VLC_ADD_PLUGINS([converter_fixed mono])
 VLC_ADD_PLUGINS([trivial_resampler ugly_resampler])
 VLC_ADD_PLUGINS([trivial_channel_mixer trivial_mixer])
@@ -5973,17 +5973,15 @@ AC_ARG_ENABLE(java-bindings,
   [  --enable-java-bindings  Enable Java bindings (default disabled)])
 if test "${enable_java_bindings}" = "yes"
 then
-  AS_IF([test "x${JAVA_HOME}" == "x"],
-	[AC_MSG_ERROR([Please set the JAVA_HOME variable to your JDK environment])])
-  AC_PROG_JAVAC
-  AC_PROG_JAVA
-  PLUGINS_BINDINGS="${PLUGINS_BINDINGS} java"
-  if test "${JAVAC}" == "javac${EXEEXT}"
-  then
-    JAVAC="javac${EXEEXT} -cp ./ "
-  fi
+        echo ""
+        echo "****** WARNING **** WARNING ***** WARNING *************"
+        echo "*** To compile the java bindings go to the 
+        echo "*** bindings/java folder and run ant.
+	echo "*** This configuration will continue, so you will be
+	echo "*** able to compile VideoLAN as usual.
+        echo "*******************************************************"
+        echo ""
 fi
-AM_CONDITIONAL(BUILD_JAVA, [test "${enable_java_bindings}" = "yes"])
 
 dnl
 dnl  test plugins
@@ -6162,8 +6160,6 @@ AC_CONFIG_FILES([
   projects/activex/Makefile
   projects/activex/axvlc.inf
   bindings/Makefile
-  bindings/java/Makefile
-  bindings/java/src/Makefile
   bindings/python/Makefile
   doc/Makefile
   extras/package/ipkg/Makefile