Attachment 1284 Details for Bug 1520 – tdemultimedia: fix build with automake 1.13 (2)

By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release.

[patch] tdemultimedia: fix build with automake 1.13 (2)

tdemultimedia-3.5.13.2-cvs.patch (text/plain), 1.62 KB, created by Slávek Banko on 2013-05-22 10:38:31 CDT

(hide)

Description:

Filename:

MIME Type:

Creator: Slávek Banko

Created: 2013-05-22 10:38:31 CDT

Size: 1.62 KB

patch

obsolete

>Index: b/admin/cvs.sh
>===================================================================
>--- a/admin/cvs.sh	2013-05-22 17:34:41.870203477 +0200
>+++ b/admin/cvs.sh	2013-05-22 17:35:08.553206290 +0200
>@@ -68,7 +68,7 @@
>     echo "*** KDE requires automake $required_automake_version"
>     exit 1
>     ;;
>-  automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10* | automake*1.11* | automake*1.12*)
>+  automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10* | automake*1.11* | automake*1.12* | automake*1.13* )
>     echo "*** $AUTOMAKE_STRING found."
>     UNSERMAKE=no
>     ;;
>@@ -128,7 +128,7 @@
> echo "*** Creating configure"
> call_and_fix_autoconf
> 
>-if egrep "^AM_CONFIG_HEADER" configure.in >/dev/null 2>&1; then
>+if egrep "^A[MC]_CONFIG_HEADER" configure.in >/dev/null 2>&1; then
>   echo "*** Creating config.h template"
>   $AUTOHEADER || exit 1
>   touch config.h.in
>@@ -184,7 +184,7 @@
>   fi
> fi
> $ACLOCAL $ACLOCALFLAGS
>-if egrep "^AM_CONFIG_HEADER" configure.in >/dev/null 2>&1; then
>+if egrep "^A[MC]_CONFIG_HEADER" configure.in >/dev/null 2>&1; then
>   echo "*** Creating config.h template"
>   $AUTOHEADER || exit 1
>   touch config.h.in
>Index: b/admin/configure.in.min
>===================================================================
>--- a/admin/configure.in.min	2013-05-22 17:34:41.878202494 +0200
>+++ b/admin/configure.in.min	2013-05-22 17:34:43.385704000 +0200
>@@ -41,7 +41,7 @@
> KDE_SET_PREFIX
> 
> dnl generate the config header
>-AM_CONFIG_HEADER(config.h) dnl at the distribution this done
>+AC_CONFIG_HEADER(config.h) dnl at the distribution this done
> 
> dnl Checks for programs.
> AC_PROG_CC

Actions: View | Diff

Attachments on bug 1520: 1282 | 1283 | 1284