* ./HACKING: we can now use automake-1.5 instead of automake-1.6. But now

[vlc] / configure.in

diff --git a/configure.in b/configure.in
index 6ea1306eeb59cd11f26c029d704a1d3b8b86285c..a72c363254e12753b7ce2a36a2546e41e1dff0fb 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,7 @@
 dnl Autoconf settings for vlc
-AC_INIT(include/main.h)
-AC_CONFIG_HEADER(include/defs.h)
+AC_INIT(configure.in)
+
+AC_PREREQ(2.50)
 AC_CANONICAL_SYSTEM
 
 CONFIGURE_LINE="$0 $*"
@@ -9,6 +10,9 @@ PACKAGE="vlc"
 VERSION="0.5.0-cvs"
 CODENAME="Natalya"
 
+AM_INIT_AUTOMAKE(${PACKAGE}, ${VERSION})
+AM_CONFIG_HEADER(config.h)
+
 dnl
 dnl  Save *FLAGS
 dnl
@@ -19,9 +23,10 @@ save_LDFLAGS="${LDFLAGS}"
 dnl
 dnl Check for tools
 dnl
-AC_PROG_MAKE_SET
 AC_PROG_CC
 AC_PROG_CPP
+AC_PROG_MAKE_SET
+AC_PROG_INSTALL
 
 dnl Find the right ranlib, even when cross-compiling
 AC_CHECK_TOOL(RANLIB, ranlib, :)
@@ -48,9 +53,7 @@ fi
 
 dnl Gettext stuff
 ALL_LINGUAS="de en_GB fr ja no ru nl pl se"
-
-AC_DEFINE_UNQUOTED(VLC_PACKAGE, "${PACKAGE}", [Package name])
-AC_DEFINE_UNQUOTED(VLC_VERSION, "${VERSION}", [Package version])
+AM_GNU_GETTEXT_VERSION(0.10.40)
 AM_GNU_GETTEXT
 
 dnl AM_PROG_LIBTOOL
@@ -446,7 +449,7 @@ PLUGINS="${PLUGINS} demux/mpeg/es demux/mpeg/audio demux/mpeg/mpeg_system demux/
 PLUGINS="${PLUGINS} codec/mpeg_video/idct/idct codec/mpeg_video/idct/idctclassic codec/mpeg_video/motion/motion codec/mpeg_video/mpeg_video codec/spudec/spudec codec/spdif codec/mpeg_audio/mpeg_audio"
 PLUGINS="${PLUGINS} codec/a52old/imdct/imdct codec/a52old/downmix/downmix codec/a52old/a52old"
 #PLUGINS="${PLUGINS} codec/lpcm/lpcm"
-PLUGINS="${PLUGINS} video_filter/deinterlace/deinterlace video_filter/invert video_filter/wall video_filter/transform video_filter/distort video_filter/clone video_filter/crop"
+PLUGINS="${PLUGINS} video_filter/deinterlace/deinterlace video_filter/invert video_filter/wall video_filter/transform video_filter/distort video_filter/clone video_filter/crop video_filter/motionblur"
 PLUGINS="${PLUGINS} audio_filter/converter/float32tos16 audio_filter/converter/float32tos8 audio_filter/converter/float32tou16 audio_filter/converter/float32tou8 audio_filter/converter/a52tospdif audio_filter/converter/fixed32tofloat32 audio_filter/converter/fixed32tos16 audio_filter/converter/s16tofloat32"
 PLUGINS="${PLUGINS} audio_filter/resampler/trivial audio_filter/resampler/ugly"
 PLUGINS="${PLUGINS} audio_filter/channel_mixer/trivial"
@@ -454,7 +457,7 @@ PLUGINS="${PLUGINS} audio_mixer/trivial audio_mixer/spdif"
 PLUGINS="${PLUGINS} audio_output/file"
 #PLUGINS="${PLUGINS} visualization/scope/scope"
 PLUGINS="${PLUGINS} video_chroma/i420_rgb video_chroma/i420_yuy2 video_chroma/i422_yuy2 video_chroma/i420_ymga"
-
+PLUGINS="${PLUGINS} demux/util/id3"
 dnl
 dnl  Network modules
 dnl
@@ -1022,7 +1025,9 @@ fi
 dnl
 dnl   libid3tag support
 dnl
-AC_CHECK_HEADERS(id3tag.h, [audio_LDFLAGS="${audio_LDFLAGS} -lz -lid3tag"])
+AC_CHECK_HEADERS(id3tag.h, [
+  id3tag_LDFLAGS="${id3tag_LDFLAGS} -lz -lid3tag"
+  PLUGINS="${PLUGINS} demux/util/id3tag"])
    
 dnl
 dnl  ffmpeg decoder plugin
@@ -2064,8 +2069,6 @@ AC_SUBST(RELEASE)
 AC_SUBST(MOC)
 AC_SUBST(WINDRES)
 AC_SUBST(BCBUILDER)
-AC_SUBST(PACKAGE)
-AC_SUBST(VERSION)
 AC_SUBST(NEED_GETOPT)
 AC_SUBST(MOZILLA)
 
@@ -2163,9 +2166,19 @@ AC_SUBST(waveout_LDFLAGS)
 AC_SUBST(x11_LDFLAGS)
 AC_SUBST(xvideo_LDFLAGS)
 AC_SUBST(xosd_LDFLAGS)
-
-AC_OUTPUT([Makefile.config Makefile.opts po/Makefile.in vlc-config])
-chmod a+x vlc-config
+AC_SUBST(id3tag_LDFLAGS)
+        
+AC_OUTPUT([
+  Makefile
+  Makefile.config
+  Makefile.opts
+  m4/Makefile
+  intl/Makefile
+  po/Makefile.in
+  vlc-config
+],[
+  chmod a+x vlc-config
+])
 
 echo "
 vlc configuration