* ./configure.in: we now require autoconf 2.5x because previous versions

[vlc] / configure.in

diff --git a/configure.in b/configure.in
index 6c8f718b9e5a5ae248dc27c546315737ec2b0d8c..1245e1ab1b0c81b3b1a1785a61d9d0e50de23d50 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,7 @@
 dnl Autoconf settings for vlc
-AC_INIT(include/main.h)
-AM_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, :)
@@ -51,6 +56,7 @@ 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
@@ -2167,8 +2173,17 @@ AC_SUBST(xvideo_LDFLAGS)
 AC_SUBST(xosd_LDFLAGS)
 AC_SUBST(id3tag_LDFLAGS)
         
-AC_OUTPUT([Makefile Makefile.config Makefile.opts po/Makefile.in vlc-config m4/Makefile  intl/Makefile ])
-chmod a+x vlc-config
+AC_OUTPUT([
+  Makefile
+  Makefile.config
+  Makefile.opts
+  m4/Makefile
+  intl/Makefile
+  po/Makefile.in
+  vlc-config
+],[
+  chmod a+x vlc-config
+])
 
 echo "
 vlc configuration