avidemux-autoconf.patch

   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
   4 @@ -21,16 +21,16 @@
   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`"
  12    fi
  13  }
  14
  15  checkAutoheader()
  16  {
  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`"
  26 @@ -47,9 +47,9 @@
  27  checkAutomakeAclocal ()
  28  {
  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
  43 @@ -37,9 +37,15 @@
  44
  45  dnl Perform program name transformation
  46  AC_ARG_PROGRAM
  47 +
  48 +AC_GNU_SOURCE
  49 +
  50  dnl Automake doc recommends to do this only here. (Janos)
  51  AM_INIT_AUTOMAKE(avidemux,"2.3.0")
  52  ADM_SUBVERSION="0"
  53 +
  54 +AM_PROG_AS
  55 +
  56  dnl almost the same like KDE_SET_PEFIX but the path is /usr/local
  57  dnl
  58  unset CDPATH
  59 @@ -79,7 +83,7 @@
  60
  61  CPPFLAGS="  $USER_INCLUDES  $CPPFLAGS"
  62  dnl __________gettext_________________
  63 -AM_GNU_GETTEXT( [external])
  64 +AM_GNU_GETTEXT
  65  GETTEXT_PACKAGE=avidemux
  66  AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], "$GETTEXT_PACKAGE",
  67                     [gettext package name])