Changeset e3401d578754e7fd0dd49ba18b95b527420f1630

Timestamp:

08/26/02 22:49:50 (6 years ago)

Author:

Sam Hocevar <sam@videolan.org>

git-committer:

Sam Hocevar <sam@videolan.org> 1030394990 +0000

git-parent:

[86f23938c10f4823f3389912f898dedd62c73ab7]

git-author:

Sam Hocevar <sam@videolan.org> 1030394990 +0000

Message:

• ./configure.in: we now require autoconf 2.5x because previous versions
  don't seem to work very well if you are using autopoint, although
  gettext 0.11.5 claims to be fully backwards compatible. Welcome to
  automake hell.
  
• ./bootstrap: workaround which uses gettextize if you do not have
  autopoint. We'll probably stay like this for a while, until gettext
  0.11.x (which replaces gettextize with autopoint) becomes more
  widespread. Currently this workaround seems to work, but don't expect
  a clean tarball if you make dist without having used autopoint. Welcome
  to automake hell.
  

Files:

• HACKING (modified) (2 diffs)
• Makefile.am (modified) (1 diff)
• bootstrap (modified) (9 diffs)
• configure.in (modified) (5 diffs)

HACKING

@@ -1 @@
-2 2002/08/26 09:38:1
+3 2002/08/26 20:49:4
-
-Hacking vlc
@@ -6 +6 @@
-You will need the following tools if you plan to use the CVS version of vlc:
-
-13
-4
+50
+6
- - gettext version 0.10.4 or later
-

Makefile.am

@@ -4 +4 @@
-ACLOCAL_AMFLAGS = -I m4
-
-
+
+
+

bootstrap

@@ -2 +2 @@
-
-##  bootstrap.sh file for vlc, the VideoLAN Client
-3 2002/08/26 09:38:20
+4 2002/08/26 20:49:49
-##
-##  Authors: Samuel Hocevar <sam@zoy.org>
@@ -30 +30 @@
-###  classic stuff
-###
-
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
-automake --foreign --add-missing --copy
-autoconf
-clocal -I m4
+utoheader
-
-# nuahahahahaha !! overwriting Makefile.in with what *I* want!
@@ -53 +66 @@
-##
-file=src/misc/modules_plugin.h
-echo -n " + creating headers: "
-rm -f $file
-sed 's#.*\$[I][d]:.*# * Automatically generated from '$file'.in by bootstrap.sh#' < $file.in > $file
@@ -60 +72 @@
-       sed 's/VLC_EXPORT( *\([^,]*\), *\([^,]*\), *\(.*\));.*/    (p_symbols)->\2_inner = \2; \\/' >> $file
-echo '' >> $file
-echo -n "$file "
-
-file=include/vlc_symbols.h
@@ -77 +88 @@
-echo '#endif /* __PLUGIN__ */' >> $file
-echo '' >> $file
-echo "$file."
-
-
@@ -83 +93 @@
-##  Glade sometimes sucks
-##
-echo -n " + fixing glade bugs: "
-for file in gnome_interface.c gtk_interface.c
-do
@@ -103 +112 @@
-    mv -f /tmp/$$.$file.bak modules/gui/gtk/$file
-fi
-echo -n "$file "
-done
-
@@ -113 +121 @@
-    mv -f /tmp/$$.$file.bak modules/gui/gtk/$file
-fi
-echo "$file."
-
-
@@ -123 +130 @@
-  echo "not updating potfiles. use --update-po to force doing it."
-else
-  echo -n " + updating potfiles: "
-  cd po
-  make update-po 2>&1 | grep '^[^:]*:$' | cut -f1 -d: | tr '\n' ' ' | sed 's/ $//'
-  cd ..
-  echo "."
-fi
-

configure.in

@@ -1 +1 @@
-dnl Autoconf settings for vlc
-AC_INIT(configure.in)
-
+
+
-AC_CANONICAL_SYSTEM
-
@@ -10 +11 @@
-CODENAME="Natalya"
-
+AM_INIT_AUTOMAKE(${PACKAGE}, ${VERSION})
+AM_CONFIG_HEADER(config.h)
+
-dnl
-dnl  Save *FLAGS
@@ -20 +24 @@
-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
@@ -52 +57 @@
-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
-
@@ -2168 +2174 @@
-AC_SUBST(id3tag_LDFLAGS)
-        
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-echo "