1 diff -urN avidemux-2.1.2.org/admin/detect-autoconf.sh avidemux-2.1.2/admin/detect-autoconf.sh
2 --- avidemux-2.1.2.org/admin/detect-autoconf.sh 2005-07-02 14:41:15.000000000 +0200
3 +++ avidemux-2.1.2/admin/detect-autoconf.sh 2007-01-04 17:16:16.539072500 +0100
5 AUTOCONF="`$WHICH autoconf253`"
6 elif test -x "`$WHICH autoconf-2.52`" ; then
7 AUTOCONF="`$WHICH autoconf-2.52`"
8 - elif test -x "`$WHICH autoconf2.50`" ; then
9 - AUTOCONF="`$WHICH autoconf2.50`"
10 + elif test -x "`$WHICH autoconf`" ; then
11 + AUTOCONF="`$WHICH autoconf`"
17 - if test -x "`$WHICH autoheader-2.5x`" ; then
18 - AUTOHEADER="`$WHICH autoheader-2.5x`"
19 - AUTOM4TE="`$WHICH autom4te-2.5x`"
20 + if test -x "`$WHICH autoheader`" ; then
21 + AUTOHEADER="`$WHICH autoheader`"
22 + AUTOM4TE="`$WHICH autom4te`"
23 elif test -x "`$WHICH autoheader-2.53`" ; then
24 AUTOHEADER="`$WHICH autoheader-2.53`"
25 AUTOM4TE="`$WHICH autom4te-2.53`"
27 checkAutomakeAclocal ()
29 if test -z "$UNSERMAKE"; then
30 - if test -x "`$WHICH automake-1.8`" ; then
31 - AUTOMAKE="`$WHICH automake-1.8`"
32 - ACLOCAL="`$WHICH aclocal-1.8`"
33 + if test -x "`$WHICH automake`" ; then
34 + AUTOMAKE="`$WHICH automake`"
35 + ACLOCAL="`$WHICH aclocal`"
36 elif test -x "`$WHICH automake-1.7`" ; then
37 AUTOMAKE="`$WHICH automake-1.7`"
38 ACLOCAL="`$WHICH aclocal-1.7`"
39 diff -urN avidemux-2.1.2.org/admin/detect-autoconf.sh.orig avidemux-2.1.2/admin/detect-autoconf.sh.orig
40 diff -urN avidemux-2.1.2.org/configure.in avidemux-2.1.2/configure.in
41 --- avidemux-2.1.2.org/configure.in.in 2006-03-01 22:33:35.000000000 +0100
42 +++ avidemux-2.1.2/configure.in.in 2007-01-04 17:20:59.936783750 +0100
45 dnl Perform program name transformation
48 dnl Automake doc recommends to do this only here. (Janos)
49 AM_INIT_AUTOMAKE(avidemux,"2.4.0i (r3731)")
53 if [[ -f .svn/entries ]]; then
57 dnl _________________ gettext _________________
58 -AM_GNU_GETTEXT([external])
60 GETTEXT_PACKAGE=avidemux
61 AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], "$GETTEXT_PACKAGE", [gettext package name])
62 ADM_LOCALEDIR=${datadir}/locale